Luckily, upstream have an ongoing "high priority" PR already. Let's track their effort and maybe help with testing?
As said, this is a a PR, after it gets merged we could update the live version, etc., etc. ...