diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index 3bccd29..2f63fab 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -25,9 +25,10 @@
  *
  * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
  * @param mixed  $default Optional. Default value to return if the option does not exist.
+ * @param mixed  $autoloaded_only Optional. Skip not autoloaded.
  * @return mixed Value set for the option.
  */
-function get_option( $option, $default = false ) {
+function get_option( $option, $default = false, $autoloaded_only = false ) {
 	global $wpdb;
 
 	$option = trim( $option );
@@ -82,7 +83,7 @@ function get_option( $option, $default = false ) {
 		} else {
 			$value = wp_cache_get( $option, 'options' );
 
-			if ( false === $value ) {
+			if ( false === $value && !$autoloaded_only ) {
 				$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
 
 				// Has to be get_row instead of get_var because of funkiness with 0, false, null values