Revert "Merge pull request #22866 from mikehenrty/bug-1050023-v1.4"

This reverts commit 2b42351cbc8f652b1cbafb76768386546d752204.