https://bugs.freedesktop.org/show_bug.cgi?id=93015
--- Comment #4 from Nicolai Hähnle nhaehnle@gmail.com --- Created attachment 119981 --> https://bugs.freedesktop.org/attachment.cgi?id=119981&action=edit 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.]