Revert "cm: Add CMAccount to the build"

This reverts commit b6f18ffe8a5dd7125ff231223fc5a31ad5430049.