Work on bug #7382.  I think this might have fixed it, but I have to do much more testing.