Revert "Merge pull request #22207 from svic/Bug_1043856"

This reverts commit 6a3e55ac1391a78ee77f247d69bb3f71da43ece9, reversing
changes made to efd6f69414f80e587c59e6bd2d381e30dd288d2e.