Revert "Meanwhile, use CM."

This reverts commit fbba17dfd6f7a5e06a7824da1c32124041d838ca.