Comment 2 for bug 303835

Here's a patch.