Comment 4 for bug 789229

I didn't see the fix in the git tree and took the patch from the mailing list, which was obviously missing a few things. Not sure why I missed this commit, good find.