Merge branch 'bugzilla-13620-revert' into release