Bug 24380: (QA follow-up) Simplify condition