Revert "Revert "cm: Turn it up to Eleven""

This reverts commit 8f03e21f206abd0ad4228d49676766e25d6adfea.