Fix the fallout of the previous cleanup