Revert "Merge dev-camera into dev"

This reverts commit 9b4ad19fa59af82d75364bc8a448f982b91f4fb1, reversing
changes made to b47529aaf00b9ec2f970256072ec554bb950c595.

Reverting merge. I messed up.