This reverts commit 3c97cecd. It seems to break on the CI and I don't understand why.
mentioned in merge request !3148 (merged)