This reverts commit 6c10959b. Fun: MR was not approved. I was against (as maintainer), but it was merged... => revert.