Backed out changeset a263c8cfb04f (bug 1083004) for m5 test failures