Merge pull request #21068 from tiborvass/revert-commits-from-1.10.3-rc1

Revert 3 commits from 1.10.3 rc1