Reverting r85338 for now. It's causing a bootstrap failure on PPC darwin9.