Revert "Merge pull request #15004 from cctuan/956004"

This reverts commit 6d59734b0b1700a594b4f80f415897e3e0fde682, reversing
changes made to 56958810b8c51a513b6ef3263a362da7c9922d7f.