Really fix tests broken at 9778206.