Cleanup after 8c2257a1e30d719aa3465970e96553e8db46e3b4