Merge pull request #14688 from eileenmcnaughton/revert