Merge branch 'revert-136c9de2' into 'master'

Revert "Merge branch 'release-v1-1-4' into 'master'"

See merge request !99
3 jobs for master
in 5 minutes and 4 seconds, using 0 compute credits, and was queued for 4 minutes and 26 seconds