Merge branch 'revert-4806fefb' into 'testing'

Revert "Merge branch 'cherry-pick-5b932c11' into 'testing'"

See merge request !170
1 job for testing in 6 seconds (queued for 1 second)