Backed out changeset 2152e0e62c5a (bug 1021874) under suspicion of breaking b2g mochitest-4 when it was already broken by something else