Revert "Merge pull request #22901 from nullaus/v1.4"

This reverts commit ab9a57d204c8c06cccc70cb7190da789fe17a3cb, reversing
changes made to 518c6afa28dc3b87e3a7360ee4b751885884d03d.