Merge pull request #26124 from nullaus/master

Revert "Merge pull request #25589 from nullaus/bug1077595"