> I haven't tested the patch, but I can't see why it would fail.

Alright, it did in fact fail.  Here's the (hopefully) correct patch.