diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 2e652e5..187936d 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -529,13 +529,13 @@ function field_ui_field_settings_form($form, &$form_state, $instance) {
     '#parents' => array('field'),
     '#field_prefix' => '<div class="container-inline">',
     '#field_suffix' => '</div>',
-    '#title' => t('Maximum number of values users can enter'),
+    '#title' => t('Allowed number of values'),
   );
   $form['field']['cardinality_container']['cardinality'] = array(
     '#type' => 'select',
     '#options' => array(
-      'number' => t('Restrict number of values'),
-      FIELD_CARDINALITY_UNLIMITED => t('Unlimited values'),
+      'number' => t('Limited'),
+      FIELD_CARDINALITY_UNLIMITED => t('Unlimited'),
     ),
     '#prefix' => '<div class="container-inline">',
     '#default_value' => ($cardinality == FIELD_CARDINALITY_UNLIMITED) ? FIELD_CARDINALITY_UNLIMITED : 'number',
@@ -554,8 +554,8 @@ function field_ui_field_settings_form($form, &$form_state, $instance) {
     ),
   );
   if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) {
-    $form['field']['cardinality_container']['#description'] = t('%unlimited will provide an %add-more button so users can add as many values as they like.', array(
-      '%unlimited' => t('Unlimited values'),
+    $form['field']['cardinality_container']['#description'] = t('%unlimited will provide an %add-more button.', array(
+      '%unlimited' => t('Unlimited'),
       '%add-more' => t('Add another item'),
     ));
   }
@@ -583,20 +583,6 @@ function field_ui_field_settings_form($form, &$form_state, $instance) {
 }
 
 /**
- * Form validation handler for field_ui_field_edit_form().
- *
- * @see field_ui_field_settings_form_submit().
- */
-function field_ui_field_settings_form_validate($form, &$form_state) {
-  // Validate field cardinality.
-  $cardinality = $form_state['values']['field']['cardinality'];
-  $cardinality_number = $form_state['values']['field']['cardinality_number'];
-  if ($cardinality == 'other' && empty($cardinality_other)) {
-    form_error($form['field']['container']['cardinality_other'], t('Number of values is required.'));
-  }
-}
-
-/**
  * Form submission handler for field_ui_field_settings_form().
  */
 function field_ui_field_settings_form_submit($form, &$form_state) {
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php b/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
index 9aff558..3f55435 100644
--- a/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php
@@ -91,7 +91,7 @@ function testTextField() {
    */
   function testTextFieldFormatted() {
     // Make node body multiple.
-    $edit = array('field[container][cardinality]' => -1);
+    $edit = array('field[cardinality]' => FIELD_CARDINALITY_UNLIMITED);
     $this->drupalPost('admin/structure/types/manage/article/fields/body/field-settings', $edit, t('Save field settings'));
     $this->drupalGet('node/add/article');
     $this->assertFieldByXPath("//input[@name='body_add_more']", t('Add another item'), 'Body field cardinality set to multiple.');