diff --git a/core/modules/book/book.install b/core/modules/book/book.install
index 7d70a02..3df264f 100644
--- a/core/modules/book/book.install
+++ b/core/modules/book/book.install
@@ -42,8 +42,6 @@ function _book_install_type_create() {
   $book_node_type = node_type_set_defaults($book_node_type);
   node_type_save($book_node_type);
   node_add_body_field($book_node_type);
-  // Default to not promoted.
-  variable_set('node_options_book', array('status'));
 }
 
 /**
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 9f16099..16c86eb 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -11,11 +11,6 @@
 function forum_install() {
   // Set the weight of the forum.module to 1 so it is loaded after the taxonomy.module.
   module_set_weight('forum', 1);
-  // Forum topics are published by default, but do not have any other default
-  // options set (for example, they are not promoted to the front page).
-  // @todo Convert to default module configuration, once Node module's content
-  //   types are converted.
-  variable_set('node_options_forum', array('status'));
 }
 
 /**
diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index 156576b..351b897 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -195,7 +195,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
   );
   $form['workflow']['node_options'] = array('#type' => 'checkboxes',
     '#title' => t('Default options'),
-    '#default_value' => variable_get('node_options_' . $type->type, array('status', 'promote')),
+    '#default_value' => variable_get('node_options_' . $type->type, array('status')),
     '#options' => array(
       'status' => t('Published'),
       'promote' => t('Promoted to front page'),
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index a0a71ff..756e99b 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -1160,6 +1160,28 @@ function node_update_8019() {
 }
 
 /**
+ * Change default promoted flag of node types to enabled.
+ *
+ * The default for 'Promoted to front page' was changed from enabled to
+ * disabled. Since enabled was the implicit default previously, and may not have
+ * been explicitly configured as such, this update ensures that the old implicit
+ * default is still the default.
+ */
+function node_update_8020() {
+  // Fetch the available node types.
+  $types = db_query('SELECT type FROM {node_type}')->fetchCol();
+
+  foreach ($types as $type) {
+    $options = variable_get("node_options_$type");
+    if (!isset($options)) {
+      $options['promote'] = 'promote';
+      $options['status'] = 'status';
+      variable_set("node_options_$type", $options);
+    }
+  }
+}
+
+/**
  * @} End of "addtogroup updates-7.x-to-8.x"
  * The next series of updates should start at 9000.
  */
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index 0075ebd..fa673b4 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -82,10 +82,12 @@ function standard_install() {
     rdf_mapping_save($rdf_mapping);
   }
 
-  // Default "Basic page" to not be promoted and have comments disabled.
-  variable_set('node_options_page', array('status'));
+  // Default "Basic page" to have comments disabled.
   variable_set('comment_page', COMMENT_NODE_HIDDEN);
 
+  // Default "Article" to be promoted.
+  variable_set('node_options_article', array('status', 'promote'));
+
   // Don't display date and author information for "Basic page" nodes by default.
   variable_set('node_submitted_page', FALSE);