Revert r173678.

Broken tests.