Backed out changeset e451b39305f6 (bug 949488) for breaking mochitest-8 on at least b2g