Revert "'update to latest cm changes'"

This reverts commit cee332edd65190796f027e0b0b3d6c2c9055e05d.

'Revert'