Backout 96f2990b1124 (bug 840612) due to orange on Mn. CLOSED TREE