Revert "Move these to cm.mk"

This reverts commit efd8c04a4c839277830e4f02d07db75ee2ad543a.