Backed out changeset 96dbf1ff169c (bug 995943)
Backed out changeset 9899ea7e3a32 (bug 995943) for m-other test failures