Revert "remove cm stuff"

This reverts commit 35c09fcaeab602add584912e3a9e99d3ddfd2e7f.
Revert "remove cm stuff"

This reverts commit 35c09fcaeab602add584912e3a9e99d3ddfd2e7f.