I'm really sorry for having dropped the ball on it, but I cannot apply it anymore. I guess that by now this patch is obsolete? Or should we try to figure out where this code went?

Hmmmm...
I was losing track of what local commit matched what diff.

I think I have worked out how to do a consolidated diff against the current master if that helps.

Yes, that would be best. I can push that for you while you're waiting for your
powers.