Reenable CM features

These are back in place, re-enable them

Change-Id: I98a40344c4670a69aa2667dea9faf77678138c23