Why not just move it to core?