diff --git a/lib/editor-features.php b/lib/editor-features.php
deleted file mode 100644
index 4f43424e29e1a7..00000000000000
--- a/lib/editor-features.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Experimental editor features config functionality.
- *
- * @package gutenberg
- */
-
-/**
- * Returns the default config for editor features,
- * or an empty array if none found.
- *
- * @return array Default features config for the editor.
- */
-function gutenberg_experimental_get_editor_features_config() {
-	$empty_config = array();
-	$config_path  = __DIR__ . '/experimental-default-theme.json';
-	if ( ! file_exists( $config_path ) ) {
-		return $empty_config;
-	}
-
-	$theme_config = json_decode(
-		@file_get_contents( $config_path ),
-		true
-	);
-	if (
-		empty( $theme_config['global']['features'] ) ||
-		! is_array( $theme_config['global']['features'] )
-	) {
-		return $empty_config;
-	}
-
-	return $theme_config['global']['features'];
-}
-
-
-/**
- * Extends editor settings with the features loaded from default config.
- *
- * @param array $settings Default editor settings.
- *
- * @return array Filtered editor settings.
- */
-function gutenberg_extend_settings_editor_features( $settings ) {
-	$editor_features                    = gutenberg_experimental_get_editor_features_config();
-	$settings['__experimentalFeatures'] = $editor_features;
-
-	return $settings;
-}
-add_filter( 'block_editor_settings', 'gutenberg_extend_settings_editor_features' );
diff --git a/lib/global-styles.php b/lib/global-styles.php
index 2c3eddda4eb1b0..60c2b15c036963 100644
--- a/lib/global-styles.php
+++ b/lib/global-styles.php
@@ -536,24 +536,18 @@ function gutenberg_experimental_global_styles_normalize_schema( $tree ) {
 }
 
 /**
- * Returns the stylesheet resulting of merging
- * core's, theme's, and user's origins.
+ * Takes data from the different origins (core, theme, and user)
+ * and returns the merged result.
  *
- * @return string
+ * @return array Merged trees.
  */
-function gutenberg_experimental_global_styles_get_stylesheet() {
-	$gs_merged = array();
-	$gs_core   = gutenberg_experimental_global_styles_get_core();
-	$gs_theme  = gutenberg_experimental_global_styles_get_theme();
-	$gs_user   = gutenberg_experimental_global_styles_get_user();
+function gutenberg_experimental_global_styles_get_merged_origins() {
+	$core   = gutenberg_experimental_global_styles_get_core();
+	$theme  = gutenberg_experimental_global_styles_get_theme();
+	$user   = gutenberg_experimental_global_styles_get_user();
+	$merged = gutenberg_experimental_global_styles_merge_trees( $core, $theme, $user );
 
-	$gs_merged = gutenberg_experimental_global_styles_merge_trees( $gs_core, $gs_theme, $gs_user );
-
-	$stylesheet = gutenberg_experimental_global_styles_resolver( $gs_merged );
-	if ( empty( $stylesheet ) ) {
-		return;
-	}
-	return $stylesheet;
+	return $merged;
 }
 
 /**
@@ -561,14 +555,35 @@ function gutenberg_experimental_global_styles_get_stylesheet() {
  * and enqueues the resulting stylesheet.
  */
 function gutenberg_experimental_global_styles_enqueue_assets() {
-
-	$stylesheet = gutenberg_experimental_global_styles_get_stylesheet();
+	$merged     = gutenberg_experimental_global_styles_get_merged_origins();
+	$stylesheet = gutenberg_experimental_global_styles_resolver( $merged );
+	if ( empty( $stylesheet ) ) {
+		return;
+	}
 
 	wp_register_style( 'global-styles', false, array(), true, true );
 	wp_add_inline_style( 'global-styles', $stylesheet );
 	wp_enqueue_style( 'global-styles' );
 }
 
+/**
+ * Returns the default config for editor features,
+ * or an empty array if none found.
+ *
+ * @param array $config Config to extract values from.
+ * @return array Default features config for the editor.
+ */
+function gutenberg_experimental_global_styles_get_editor_features( $config ) {
+	if (
+		empty( $config['global']['features'] ) ||
+		! is_array( $config['global']['features'] )
+	) {
+		return array();
+	}
+
+	return $config['global']['features'];
+}
+
 /**
  * Adds the necessary data for the Global Styles client UI to the block settings.
  *
@@ -591,7 +606,11 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
 	// Add the styles for the editor via the settings
 	// so they get processed as if they were added via add_editor_styles:
 	// they will get the editor wrapper class.
-	$settings['styles'][] = array( 'css' => gutenberg_experimental_global_styles_get_stylesheet() );
+	$merged               = gutenberg_experimental_global_styles_get_merged_origins();
+	$stylesheet           = gutenberg_experimental_global_styles_resolver( $merged );
+	$settings['styles'][] = array( 'css' => $stylesheet );
+
+	$settings['__experimentalFeatures'] = gutenberg_experimental_global_styles_get_editor_features( $merged );
 
 	return $settings;
 }
diff --git a/lib/load.php b/lib/load.php
index 3815faf3761417..cc8c54210033c3 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -101,5 +101,4 @@ function gutenberg_is_experiment_enabled( $name ) {
 require dirname( __FILE__ ) . '/customizer.php';
 require dirname( __FILE__ ) . '/edit-site-page.php';
 require dirname( __FILE__ ) . '/edit-site-export.php';
-require dirname( __FILE__ ) . '/editor-features.php';
 require dirname( __FILE__ ) . '/global-styles.php';