Revert "Merge pull request #22769 from mpizza/Bug_1050097_uplift_to_v1.4"

This reverts commit ec395d47cee9234ae93d2410d8ef8724dfc5d6cb, reversing
changes made to fda0319ff8c10e54faa7f0eaec256402044209b5.