Comment 5 for bug 792288

Here's the fix again in patch form.