CM is sometimes dumb!

This reverts commit 31a34931c274bd2fbabd6c2465a590b72cff918a.