Site Id stored twice

The site id of a search entry is stored twice in 2 seperate fields:

doc.add(new Field(SearchService.FIELD_CONTEXT,
filterNull(sep.getSiteId(ref)),
Field.Store.COMPRESS, Field.Index.NOT_ANALYZED));

and

doc.add(new Field(SearchService.FIELD_SITEID,
filterNull(sep.getSiteId(ref)),
Field.Store.COMPRESS, Field.Index.NOT_ANALYZED));

One of these should be removed