CDI-58, remove IdentifiedAnnotatedType