WP-3089: remove ref field, place eva field.