Merge pull request #26124 from nullaus/master

Revert "Merge pull request #25589 from nullaus/bug1077595"
(cherry picked from commit df6c3140d88dc77366134d22367636ab3ec60a45)
Merge pull request #26125 from nullaus/bug1077595

Bug1077595
(cherry picked from commit 906123b6d71bcd9d8db77227ffba7269e6cbaeb9)