Revert "Revert "Revert Camera back to CM""

This reverts commit 507288f0d4c84b33c23a2600899620a2c9ab080c.