Bug 26268: (QA follow-up) Conditionally remove