Bug 1633: QA follow-up