> Well, there's some complication here - Nathaniel had a working patch > in, and Andrew reverted it . . . Looks like Andrew reverted only part of it.