Backed out changeset 5bb0b8d757f4 (bug 974710) for m-3 test failure