Merge branch 'revert-74b4537c' into 'debug_opencv'

Revert "Merge branch 'fix_opencv_subpackage_dependencies' into 'master'"

See merge request !465
2 jobs for debug_opencv in 10 minutes and 24 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #222002
docker
build_linux

00:10:23

passed #222003
intel macos
build_macos_intel

00:03:57