Merge pull request #10445 from mikeller/revert-10388_in_maintenance_branch