Revert "Merge pull request #21239 from russnicoletti/bug-1028835_v1.4"

This reverts commit 53a4ff9264d601ea963ead1a58e810c39580c0aa, reversing
changes made to bf5ad311b6a14383924d6a3898c650ffa4525840.