diff --git a/modules/aggregator/aggregator.install b/modules/aggregator/aggregator.install
index f19d7de..bbc31d5 100644
--- a/modules/aggregator/aggregator.install
+++ b/modules/aggregator/aggregator.install
@@ -287,9 +287,10 @@ function aggregator_update_7000() {
 }
 
 /**
- * Add aggregator teaser length to settings from old global default teaser length
+ * Copy values from previously global settings.
  */
 function aggregator_update_7001() {
+  variable_set('aggregator_feed_item_length', variable_get('feed_item_length'));
   variable_set('aggregator_teaser_length', variable_get('teaser_length'));
 }
 
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc
index 53ecb36..f2a706c 100644
--- a/modules/aggregator/aggregator.pages.inc
+++ b/modules/aggregator/aggregator.pages.inc
@@ -386,7 +386,7 @@ function theme_aggregator_page_rss($variables) {
   drupal_add_http_header('Content-Type', 'application/rss+xml; charset=utf-8');
 
   $items = '';
-  $feed_length = variable_get('feed_item_length', 'fulltext');
+  $feed_length = variable_get('aggregator_feed_item_length', 'fulltext');
   foreach ($feeds as $feed) {
     switch ($feed_length) {
       case 'teaser':
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 6eb2c66..220a6db 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -111,6 +111,13 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
       'select' => t('multiple selector')),
       '#description' => t('For a small number of categories, checkboxes are easier to use, while a multiple selector works well with large numbers of categories.'),
     );
+    $form['modules']['aggregator']['aggregator_feed_item_length'] = array(
+      '#type' => 'select',
+      '#title' => t('Feed content'),
+      '#default_value' => 'fulltext',
+      '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')),
+      '#description' => t('Default setting for the display of content items in each exported feed.')
+    );
     $form['modules']['aggregator']['aggregator_teaser_length'] = array(
       '#type' => 'select',
       '#title' => t('Length of trimmed description'),
diff --git a/modules/node/node.module b/modules/node/node.module
index 524a57f..c6534bc 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2441,9 +2441,7 @@ function node_feed($nids = FALSE, $channel = array()) {
       ->fetchCol();
   }
 
-  $item_length = variable_get('feed_item_length', 'fulltext');
   $namespaces = array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/');
-  $teaser = ($item_length == 'teaser');
 
   // Load all nodes to be rendered.
   $nodes = node_load_multiple($nids);
@@ -2468,11 +2466,9 @@ function node_feed($nids = FALSE, $channel = array()) {
       $namespaces = array_merge($namespaces, $node->rss_namespaces);
     }
 
-    if ($item_length != 'title') {
-      // We render node contents and force links to be last.
-      $build['links']['#weight'] = 1000;
-      $item_text .= drupal_render($build);
-    }
+    // We render node contents and force links to be last.
+    $build['links']['#weight'] = 1000;
+    $item_text .= drupal_render($build);
 
     $items .= format_rss_item($node->title, $node->link, $item_text, $node->rss_elements);
   }
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 9e7d69d..345253f 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1847,13 +1847,6 @@ function system_rss_feeds_settings() {
     '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
     '#description' => t('Default number of items to include in each feed.')
   );
-  $form['feed_item_length'] = array(
-    '#type' => 'select',
-    '#title' => t('Feed content'),
-    '#default_value' => variable_get('feed_item_length', 'fulltext'),
-    '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')),
-    '#description' => t('Global setting for the default display of content items in each feed.')
-  );
 
   return system_settings_form($form);
 }