Merge branch 'revert-24bec5c1' into 'master'

Revert "Merge branch 'cr/103221-1/032' into 'master'"

See merge request !74
1 job for cr/103280/0987
in 36 seconds, using 0 compute credits, and was queued for 3 seconds