Backed out changeset 3a242f8d8298 (bug 856032) for mochitest-2 failures.