Bug 5226: Follow up to new/awaiting_qa/bug_5226