Backed out changeset a0bc16b5a428 (bug 897676) for causing mochitest failures on a CLOSED TREE