Followup to bug 1036694