Backed out changeset 56d4cef7ed00 (bug 880114) for m5 test failures