Frank, I tried reviving this patch, but git patch failed. I recreated the patch manually (which wasn't very hard given that it contains few changes) but I don't see any effect (not breakpoint is hit). So I'm wondering whether this patch is still useful.