Revert "We hate cm :)"

This reverts commit 532b5f309331e773362958b27ee87552585afaac.