Back out 527e37564f9d.
Bug 1093507 - Fix for permaorange, with comments addressed;r=gijskruitbosch