Temporarily revert r176133 until testcases are modified.