I'll need to turn this into an actual patch and then create a test toIs there anything new on this (apologies if I managed to miss it)? Let me know if there's anything I might do to help, like maybe testing.
validate the patch but I'm pretty sure this should deal with the
problem you've come across.