Backed out changeset aa013ffd209b (bug 888974) for mochitest-4 failures.