Fix derp after cm merge