Revert "Updated a few cm branches"

This reverts commit b2e005bfdd44d8ed652e4c16944704d05cbd2225.