Revert "Merge pull request #16111 from crh0716/958736"

This reverts commit 31ece334c849d332e1c6053b22789bb9bd7b6a2f, reversing
changes made to bbe0fd0ca135d089b662975eeced57530ebb7554.