Revert "Merge pull request #22398 from evanxd/bug-1047292"

This reverts commit 9ef7ee6031c4a7a6e2c6d9e018066a5ae484d3fc, reversing
changes made to eae74908a7ab8493691b7fc6ec91d969821d9798.