diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index ca445ec610..90e74e381c 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -5,6 +5,8 @@
  * @package WordPress
  */
 
+require( ABSPATH . WPINC . '/option.php' );
+
 /**
  * Convert given date string into a different format.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 92c9b6d267..569845bdad 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38468';
+$wp_version = '4.7-alpha-38469';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 93a48be09f..d102daab20 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -94,7 +94,6 @@ wp_set_lang_dir();
 
 // Load early WordPress files.
 require( ABSPATH . WPINC . '/compat.php' );
-require( ABSPATH . WPINC . '/option.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/pomo/mo.php' );