Merge branch 'revert-1df057c4' into 'master'

Revert "Merge branch 'feature/6' into 'master'"

See merge request !7
6 jobs for lolcat in 22 seconds (queued for 167 minutes and 39 seconds)