Revert "Merge pull request #23358 from EragonJ/bug-1059106"

This reverts commit 5567c7d0b4408032723231490ed7e7ba1a3e0dcf, reversing
changes made to 008026e932b64b4a70b9931c3da96986583bc8d4.