Follow-on to 9e0631ab0d222f7e4e438f8add0e900334852857 to fix broken tests.