Bug 9394: QA Followup