Revert "Merge pull request #18406 from cctuan/968661-4"

This reverts commit 6b7a10e5d026cf031b2f3fc0fe5f671ea02dd4f9, reversing
changes made to eb97461e75cd44d20967bc410b5653dff031ef5a.