Revert "Merge pull request #17275 from cctuan/979827"

This reverts commit 11d6cd3d50c5a92a85a738a8de5a36932c8a89e6, reversing
changes made to ce8a5f8153d45000e39fc9e4b2b94521747015c3.