Move it out of contrib.