Revert "Revert Camera back to CM"

This reverts commit abbc0bbbf2e61faacbf01c1ff7e2896283fd4aa1.