Created attachment 119981 [details] [review]
related patch

Okay, so I understand what failed and why it worked before.

Could you please test both patches? The first one should fix your problem, the
second one is a related cleanup on top of it that hopefully contains no
regressions.

[I have apparently unrelated weirdness going on right now which prevents me
from testing this properly.]