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

This reverts commit e4f7bc7bc121d6351959a9578457f9d7f63d7430.