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

This reverts commit 263db7a04ccbe84d2084f3eb02a0141db89b9af7, reversing
changes made to e294dad18e049d06080b1130c0706fa178203255.