Do not skip fields that are not to be parsed

Change-Id: I45380ec4c0bb9d60a65b56e3376a97f9d49dc5d6