Backed out changeset c524051861d5 (bug 915184) for test failures. a=backout.
CLOSED TREE