Revert "Update CMM"

This reverts commit dd22f3baae7d7acea31ae76a1a94497c84865a6a.