This commit was wrong in 5.8, but fine in master where we can raise the dependency This reverts commit 9e457e8c.