It turns out there are some other fixes needed, see these two PRs for details (#28555 8 and #28561 10). If you need it now you can check out #28561 and build from source 3, otherwise it should be in the nightly package in a few days.