Revert "Enable some CM options by default"

This reverts commit 4431ea147073fcc0798f3d333170205db0f13a52.