Revert "Back to CM"

This reverts commit 0959d810e73ed2768b07dedf645803d6e4b2aa20.