Bug 21073: (QA follow-up) Simplify logic