Back out 27eb88629c56:a26582e3c44d (bug 906901)
CLOSED TREE