JAL-3047 don't set classes unconditionally (forgot to delete it in earlier patch)