This reverts merge request !351 (merged)
Has more implications as anticipated
assigned to @schaefed
enabled an automatic merge when the pipeline for 1b060f51 succeeds
merged
mentioned in commit e22d0b13