Revert r141365. It was causing MultiSource/Benchmarks/MiBench/consumer-lame to