Backed out changeset 661f503ea524 (bug 1053966) for Mnw perma-fail.