Revert "Merge pull request #21909 from crh0716/1038496"

This reverts commit aeb80a140fd2c29a62298658071d0ccb20063307.