Bug 18469: QA Follow-up