From 7e8d7f8a81a7c06b511df003230dbcf53f8c91db Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 31 Aug 2016 15:24:29 +0000
Subject: [PATCH] General: revert [38386], `functions.php` was probably too
 tempting for some people to not load by itself.

See #36335.

Built from https://develop.svn.wordpress.org/trunk@38469


git-svn-id: http://core.svn.wordpress.org/trunk@38410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 2 ++
 wp-includes/version.php   | 2 +-
 wp-settings.php           | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

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' );