Changed way cert desc stores repeated fields.

Fixed todo from previous pull request