Revert "Merge pull request #24741 from RickyChien/bug-1053703"

This reverts commit 6394efe72ce08843ef183d42d7eb1f8263be47ed, reversing
changes made to 83f495a1c12687970f7f2840c2729795c4b88177.