Revert "Merge pull request #23700 from EragonJ/bug-1059106-another-try"

This reverts commit 91117b736b5a49dbc4cdab6a9a65b556a93f8a3e, reversing
changes made to 3a63cab02f3cbb3d29a87b6e6c1968ee67520fd4.