Backed out changeset 212f295a955d (bug 966157)
Backed out changeset eb6981f3c136 (bug 966157) for m5 test failures on a CLOSED TREE