diff --git a/Export/Aggregator/CountryOfBirthAggregator.php b/Export/Aggregator/CountryOfBirthAggregator.php
index 0818c1c30..5bb08af60 100644
--- a/Export/Aggregator/CountryOfBirthAggregator.php
+++ b/Export/Aggregator/CountryOfBirthAggregator.php
@@ -81,7 +81,6 @@ class CountryOfBirthAggregator implements AggregatorInterface,
                 'Group by continents' => 'continent',
                 'Group by country' => 'country'
             ),
-            'choices_as_values' => true,
             'expanded' => true,
             'multiple' => false
         ));
diff --git a/Export/Aggregator/NationalityAggregator.php b/Export/Aggregator/NationalityAggregator.php
index e4554a8f0..d708957f7 100644
--- a/Export/Aggregator/NationalityAggregator.php
+++ b/Export/Aggregator/NationalityAggregator.php
@@ -80,7 +80,6 @@ class NationalityAggregator implements AggregatorInterface,
                 'Group by continents' => 'continent',
                 'Group by country' => 'country'
             ),
-            'choices_as_values' => true,
             'expanded' => true,
             'multiple' => false
         ));
diff --git a/Export/Export/ListPerson.php b/Export/Export/ListPerson.php
index 54571e4c0..dc36c8c57 100644
--- a/Export/Export/ListPerson.php
+++ b/Export/Export/ListPerson.php
@@ -98,7 +98,6 @@ class ListPerson implements ListInterface, ExportElementValidatedInterface
             'multiple' => true,
             'expanded' => true,
             'choices' => $choices,
-            'choices_as_values' => true,
             'label'    => 'Fields to include in export',
             'choice_attr' => function($val, $key, $index) {
                 // add a 'data-display-target' for address fields
diff --git a/Export/Filter/GenderFilter.php b/Export/Filter/GenderFilter.php
index 43e6c62a5..7db76f6a7 100644
--- a/Export/Filter/GenderFilter.php
+++ b/Export/Filter/GenderFilter.php
@@ -66,7 +66,6 @@ class GenderFilter implements FilterInterface,
                 'Both' => Person::BOTH_GENDER,
                 'Not given' => 'null'
             ),
-            'choices_as_values' => true,
             'multiple' => true,
             'expanded' => true
         ));
diff --git a/Form/Type/GenderType.php b/Form/Type/GenderType.php
index ad778d24a..bdd31e899 100644
--- a/Form/Type/GenderType.php
+++ b/Form/Type/GenderType.php
@@ -29,7 +29,6 @@ class GenderType extends AbstractType {
 
         $resolver->setDefaults(array(
             'choices' => $a,
-            'choices_as_values' => true,
             'expanded' => true,
             'multiple' => false,
             'placeholder' => null
diff --git a/Search/PersonSearch.php b/Search/PersonSearch.php
index 6d562ec95..b11b98bbe 100644
--- a/Search/PersonSearch.php
+++ b/Search/PersonSearch.php
@@ -333,7 +333,6 @@ class PersonSearch extends AbstractSearch implements ContainerAwareInterface,
                     'Man' => Person::MALE_GENDER,
                     'Woman' => Person::FEMALE_GENDER
                 ],
-                'choices_as_values' => true,
                 'label' => 'Gender',
                 'required' => false
             ])