Revert "Merge pull request #25536 from crh0716/1089572"

This reverts commit 1af362224eb9ba09f13ad9c363e1c6fff6044431, reversing
changes made to c4b403023bb657d4d5e1cadfb5cc55e757c337cf.