Merge branch 'revert-8f3ed778' into 'master'

Revert "Merge branch 'dev-vis-mask' into 'master'"

See merge request !161
3 jobs for master
in 31 minutes and 27 seconds, using 0 compute credits, and was queued for 34 minutes and 25 seconds