Revert "Merge pull request #25997 from crh0716/1090843"

This reverts commit 07e24e6f19271bedaa4bb0294e17eeefa9401997, reversing
changes made to f20b72cb0e3ad4888642906ae3ce27bacff010b2.