Backed out changeset a6f85ff386c1 (bug 1011569) for m5 test failures on OS X