Revert "Merge pull request #17619 from KevinGrandon/revert_camera_features"

This reverts commit 9b093b55fd98d8a86251397a196fd9591a35a88e, reversing
changes made to c8c0c65f334a50c99638841a4593dc6394d29c62.
Bug 988118 - Gaia unit test failures on TBPL due to the camera merge
Merge pull request #17623 from justindarc/camera-new-features+bug988118

Bug 988118 - Gaia unit test failures on TBPL due to the camera merge