diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index 566959b..2e652e5 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -521,35 +521,41 @@ function field_ui_field_settings_form($form, &$form_state, $instance) {
 
   // Build the configurable field values.
   $cardinality = $field['cardinality'];
-  $form['field']['container'] = array(
-    // We can't use the container element because it doesn't support the title
-    // or description properties.
-    '#type' => 'item',
+  $form['field']['cardinality_container'] = array(
+     // We can't use the container element because it doesn't support the title
+     // or description properties.
+     '#type' => 'item',
+    // Reset #parents to 'field', so the additional container does not appear.
+    '#parents' => array('field'),
     '#field_prefix' => '<div class="container-inline">',
     '#field_suffix' => '</div>',
     '#title' => t('Maximum number of values users can enter'),
   );
-  $form['field']['container']['cardinality'] = array(
+  $form['field']['cardinality_container']['cardinality'] = array(
     '#type' => 'select',
-    '#options' => drupal_map_assoc(range(1, 5)) + array(FIELD_CARDINALITY_UNLIMITED => t('Unlimited')) + array('other' => t('More')),
-    '#default_value' => ($cardinality < 6) ? $cardinality : 'other',
+    '#options' => array(
+      'number' => t('Restrict number of values'),
+      FIELD_CARDINALITY_UNLIMITED => t('Unlimited values'),
+    ),
+    '#prefix' => '<div class="container-inline">',
+    '#default_value' => ($cardinality == FIELD_CARDINALITY_UNLIMITED) ? FIELD_CARDINALITY_UNLIMITED : 'number',
   );
-  // @todo Convert when http://drupal.org/node/1207060 gets in.
-  $form['field']['container']['cardinality_other'] = array(
+  $form['field']['cardinality_container']['cardinality_number'] = array(
     '#type' => 'number',
-    '#default_value' => $cardinality > 5 ? $cardinality : 6,
+    '#default_value' => $cardinality != FIELD_CARDINALITY_UNLIMITED ? $cardinality : 1,
     '#min' => 1,
-    '#title' => t('Custom value'),
+    '#title' => t('Number'),
     '#title_display' => 'invisible',
+    '#suffix' => '</div>',
     '#states' => array(
       'visible' => array(
-       ':input[name="field[container][cardinality]"]' => array('value' => 'other'),
+       ':input[name="field[cardinality]"]' => array('value' => 'number'),
       ),
     ),
   );
   if (field_behaviors_widget('multiple values', $instance) == FIELD_BEHAVIOR_DEFAULT) {
-    $form['field']['container']['#description'] = t('%unlimited will provide an %add-more button so users can add as many values as they like.', array(
-      '%unlimited' => t('Unlimited'),
+    $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'),
       '%add-more' => t('Add another item'),
     ));
   }
@@ -583,8 +589,8 @@ function field_ui_field_settings_form($form, &$form_state, $instance) {
  */
 function field_ui_field_settings_form_validate($form, &$form_state) {
   // Validate field cardinality.
-  $cardinality = $form_state['values']['field']['container']['cardinality'];
-  $cardinality_other = $form_state['values']['field']['container']['cardinality_other'];
+  $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.'));
   }
@@ -598,14 +604,12 @@ function field_ui_field_settings_form_submit($form, &$form_state) {
   $field_values = $form_values['field'];
 
   // Save field cardinality.
-  $cardinality = $field_values['container']['cardinality'];
-  $cardinality_other = $field_values['container']['cardinality_other'];
-  $cardinality_other = $form_state['values']['field']['container']['cardinality_other'];
-  if ($cardinality == 'other') {
-    $cardinality = $cardinality_other;
+  $cardinality = $field_values['cardinality'];
+  $cardinality_number = $field_values['cardinality_number'];
+  if ($cardinality == 'number') {
+    $cardinality = $cardinality_number;
   }
   $field_values['cardinality'] = $cardinality;
-  unset($field_values['container']);
 
   // Merge incoming form values into the existing field.
   $field = field_info_field($field_values['field_name']);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
index cbc132f..c32f218 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
@@ -178,38 +178,27 @@ function addExistingField() {
   function cardinalitySettings() {
     $field_edit_path = 'admin/structure/types/manage/article/fields/body/field-settings';
 
-    // Assert the cardinality other field cannot be empty when cardinality is
-    // set to other.
+    // Submit a custom number.
     $edit = array(
-      'field[container][cardinality]' => 'other',
-      'field[container][cardinality_other]' => '',
-    );
-    $this->drupalPost($field_edit_path, $edit, t('Save field settings'));
-    $this->assertText('Number of values is required.');
-
-    // Assert the cardinality field is set to 'Other' when the value is greater
-    // than 5.
-    $edit = array(
-      'field[container][cardinality]' => 'other',
-      'field[container][cardinality_other]' => 16,
+      'field[cardinality]' => 'number',
+      'field[cardinality_number]' => 6,
     );
     $this->drupalPost($field_edit_path, $edit, t('Save field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
-    $this->assertFieldByXPath("//select[@name='field[container][cardinality]']", 'other');
-    $this->assertFieldByXPath("//input[@name='field[container][cardinality_other]']", 16);
+    $this->assertFieldByXPath("//select[@name='field[cardinality]']", 'number');
+    $this->assertFieldByXPath("//input[@name='field[cardinality_number]']", 6);
 
-    // Assert the cardinality other field is set back to 6 after changing the
-    // cardinality to less than 6.
+    // Set to unlimited.
     $edit = array(
-      'field[container][cardinality]' => 3,
-      'field[container][cardinality_other]' => 16,
+      'field[cardinality]' => FIELD_CARDINALITY_UNLIMITED,
     );
     $this->drupalPost($field_edit_path, $edit, t('Save field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
-    $this->assertFieldByXPath("//select[@name='field[container][cardinality]']", 3);
-    $this->assertFieldByXPath("//input[@name='field[container][cardinality_other]']", 6);
+    $this->drupalGet($field_edit_path);
+    $this->assertFieldByXPath("//select[@name='field[cardinality]']", FIELD_CARDINALITY_UNLIMITED);
+    $this->assertFieldByXPath("//input[@name='field[cardinality_number]']", 1);
   }
 
   /**