Revert r167540 until regression tests are updated.