Revert "Merge branch 'feature/7415_vision_performance' into develop"

This reverts commit 9de705bebc2c6c954e2587df66e930d35f5aee46, reversing
changes made to a817774ddaa63bef9749f3b54d97661df3053489.
Revert "Merge branch 'feature/7415_vision_performance' into develop"

This reverts commit a817774ddaa63bef9749f3b54d97661df3053489, reversing
changes made to 01624090d5774ac65ef0c98a7adcb2d2ce10ae19.