Revert "Merge pull request #22944 from clouserw/patch-1"

This reverts commit ddec117b2d6ac8ea50d7fd833a9cf0605d5b358b, reversing
changes made to 4fa2b260eae6501ea950e3827bbc8ac5043dd799.