Bug 18555: (QA-Followup) Remove duplicate code