More work on camera support
Revert "More work on camera support"

This reverts commit 39519cd7b5bd9dc6d10ec1a35443f950f383db3a.