Merge pull request #10444 from mikeller/revert-10383_in_maintenance_branch