Bug 15400: (follow-up) Remove unnecessary class