Revert wrong-headed test 'fix'.
Get all tests to passing.