Comment 5 for bug 610777

The commit fails to fix the bug, unfortunately.

I have the proper fix ready, but haven't committed it yet. (I'll get it committed when i get back home after the weekend.)