bug 3170 followup