Merge branch 'revert-d4439adb' into 'master'

Revert "Merge branch 'dev-Downscaling' into 'master'"

See merge request !131
2 jobs for master
in 24 minutes and 2 seconds, using 0 compute credits, and was queued for 15 minutes and 55 seconds