Backout changeset 0ff383d4a899 (bug 861453) for universal builds bustage
Backout 64abee9b00f1 (bug 841363) for suspected test_bug375003-1.html failure. (CLOSED TREE)