I'm going to pull completely fresh sources and reapply and retest, though you are welcome
to review my patch while I do that.

mark