Revert "Merge pull request #22100 from snowmantw/issue1043103"

This reverts commit 7065ddbc9c1bb08ca273362774bb142e3152cf0e, reversing
changes made to 70f3935608c9e21461db8f60c50ae1be78a4460c.