Merge branch 'revert' into 'testing'

Revert

See merge request !4
1 job for testing in 15 seconds (queued for 3 seconds)