Followup to bug 355063, 946549