Backed out changeset afc08927188a (bug 870113) for B2G mochitest-2 failures.