Backed out changeset ac697e112134 (bug 1105468) for m5 test failures