Revert "Merge pull request #18826 from crdlc/bug-1003752"

This reverts commit 36ba757723f308afa7094044aa44c2fe75c46d37, reversing
changes made to 007e4d0a090a2b93bee5accc64617246092933ab.