[core] Rework the previous commit which breaks camera sensor

Repeat after me, you will pass all the tests, all the tests ...
Indeed, the new solution is cleaner, shorter, and complete by definition
!