Bug 924679. Part 3 followup