backed out 1892b204f836 (orange) bug 855523 - CLOSED TREE