The patch i submitted re: bug 2663/6198 was more of a partial
workaround -- I'm working on an actual fix. IF you're in a hurry to
solve 6198, it's an ok fix, but if you want to wait for a more
complete solution, i'm working on it.