Comment 11 for bug 999571

I've held off on closing this one because we weren't sure about how solid the fix was, I just pushed a revised fix. If that's good then we'll close.