Revert "Merge pull request #22492 from mikehenrty/bug-1038988-one-more-time"

This reverts commit b819f32852c91afda58ea37dab6b89d878623aeb, reversing
changes made to 375805282c44248c624440eabd30515af17af7ad.