Revert "Merge pull request #22867 from yurenju/pull/22765"

This reverts commit 5f51ff804b815033cd71e750c52cf19fd3950f29, reversing
changes made to 67f0e561b524f1e80468e9536a65cd7db6fcb8cb.