Revert "oops"

This reverts commit c1d873c87b6e8f4cdfbe2464ef7cee395d64250a.
Revert "Back to straight CM"

This reverts commit 9f179fe118178ae75cbc37541769bd11dbdbbad5.