This might fix the build failures we are getting.
/CC @MartijnCuppens @mdo @Johann-S: the only way to test if this fixes the failures we are getting is to merge it and see how it goes. If it fixes our issues, we'll stick to the old version and I'll backport it to v4-dev later. If not, I'll revert this and hope for an upstream fix.