Revert "cm updates"

This reverts commit a576c5f9aee8999a3929a42e826d65c9be4f2012.