Merge branch 'revert-e86f9476' into 'master'

Revert e86f9476

See merge request !37
7 jobs for master in 7 minutes and 18 seconds (queued for 1 second)