Bug 17626 (QA followup)