Fix derp of previous cleanup commit