Bug 14610: Follow-up 2