Revert "Change some packages to CM's"

This reverts commit 997391639078a9aa194f4407294b1e5c4b17513d.