Track some CM repos again

There have been enough upstream updates so we do not need to track our own repos for now.