Comment 11 for bug 442120

The package is in unapproved now, but it has tons of other changes; I reviewed them, but I can't judge correctness since I don't understand the surrounding code.

Ken said that he tested this a lot and it works well for him.