Comment 8 for bug 331311

Patch attached to bug 329245, will upload.