This reverts merge request !1213 (merged)
assigned to @clemenci
enabled an automatic merge when the pipeline for e4be72b2 succeeds
merged
mentioned in commit a21b267b