Revert "camera: clean-up"

This reverts commit 057ec118e5aa2f7bd1369b036b9bd146474ee1c7.