Backed out changeset 13028d2039e8 (bug 1069401) for b2g m1 test failures