This got delayed quite a bit by lots of changes in the affected area around the same time this was being worked on. Those PRs got too stale to revive — and I also noticed that it was my own doing that delayed these because I was the one making all of the changes in that area. So, I took this one on and have just merged a fix.
I believe this is correct, and am also unsure it was still broken currently. Either way, it should definitely might be fixed after this merge.