Revert "Merge pull request #26629 from aosmond/bug1078435"

This reverts commit 3919250c8884439a9faaddfa18057d8b8c7f6002, reversing
changes made to 6af3d029bae3a14f400fec0926f0f8ad7b579b4b.