Revert 178811 until I fix the unit tests.