This reverts commit 61b4702a. We were seeing some test failures in SPECINT2006 due to this change. Reverting to investigate.