Revert "Merge pull request #13158 from crh0716/911701"

This reverts commit a309c93dcef94552cded8a183740ce44d6c1fc7e.