Backed out changeset 9b764e12796d (bug 1039883) for b2g m7 failures