Comment 8 for bug 1332450

Reopening as proposed fix was abandoned