Revert "Merge pull request #16500 from changm/bug960325"

This reverts commit 7540b00be89b65b180817564dfb4b8a0701179ca, reversing
changes made to 447eb65ee5a7428e3959ac3b1c0a3fbbfc125d43.