Revert "Merge branch 'revert-51677b07' into 'master'"

This reverts merge request !228
2 jobs for revert-a1a488bb in 20 minutes and 11 seconds (queued for 2 seconds)