Comment 8 for bug 1019843

I've committed this to the repository. Depending on how it works out, I might tweak it for the next version. For now, it seems to work smoothly in my experience.