Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.
Merge pull request #17619 from KevinGrandon/revert_camera_features

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"