Bug 11578: QA follow-up