I'll change the assignee to take it. I am building what I suspect is a fix to that but also have a bit of patch cleanup to survive.