I haven't actually changed anything in the fix, but I made a diff so hopefully that'll be more convenient. <>