Comment 2 for bug 784890

I marked two other bugs as duplicates. They aren't strictly speaking duplicates, but since everything is in the same file it will be difficult to make separate patches.