Revert "Merge pull request #25627 from russnicoletti/bug-1079519"

This reverts commit 7bac3bc2379453196a95117e72670009a4d856e0, reversing
changes made to 1f621c11282161cc47870ab2c8d046103270dc71.
Merge pull request #25892 from davidflanagan/revert-bug1079519

Revert "Merge pull request #25627 from russnicoletti/bug-1079519"