Revert "Merge branch 'revert-a1a488bb' into 'master'"

This reverts merge request !232
2 jobs for revert-39342075 in 19 minutes and 46 seconds (queued for 2 seconds)