Revert "more from cm"

This reverts commit 1c819b4404eaa3158be0d662a39d813f4275d6c0.