Merge pull request #11828 from eileenmcnaughton/revert