Merge branch 'revert-ea31a3cb' into 'master'

Revert "Merge branch 'issue/51' into 'master'"

See merge request !43
1 job for master in 42 seconds (queued for 5 seconds)