Bug 14805: QA follow-up