Merge branch 'revert-41533b76' into 'master'

Revert "Merge branch 'bug#94' into 'master'"

See merge request !23
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 7 seconds