Bug 22806: (QA follow-up)