Revert "Merge branch 'revert-07efad49' into 'master'"

This reverts merge request !90
4 jobs for revert-398ca7c6 in 3 minutes and 32 seconds (queued for 1 second)