Revert "Merge pull request #22093 from EragonJ/bug-1034560"

This reverts commit 31285b589c888d568499e3ded096210b2a578729, reversing
changes made to 5199de33170efe8ae73e67ec82a126a7d74dbd62.