Backed out changeset d5a514b9a0db (bug 586587) for mochitest failures.