Reverting r176944 until Author fixes test failure.