16:27 < *spb> take it out of contrib and into core