Comment 7 for bug 1271571

The issue was hit by 5+ external users, so I'm targeting this to 4.1