Revert "Merge branch 'cm' into HEAD"

This reverts commit bec95e65ec381c1bd638ef7c3a3c64a6ce288a18, reversing
changes made to 00aeacf574ea11e84928e67778023d1772348bda.