Skip needlessly adding Bento styles to AMP pages

Author: westonruter

includes/amp-helper-functions.php

@@ -999,6 +999,8 @@ function amp_register_default_styles( WP_Styles $styles ) {
 	);
 	$styles->add_data( 'amp-icons', 'rtl', 'replace' );
 
+	// These are registered exclusively for used for non-AMP pages that manually enqueue them. They aren't needed on
+	// AMP pages due to the runtime style being present and because the styles are inlined in the scripts already.
 	if ( amp_is_bento_enabled() ) {
 		foreach ( AMP_Allowed_Tags_Generated::get_extension_specs() as $extension_name => $extension_spec ) {
 			if ( empty( $extension_spec['bento']['has_css'] ) ) {

includes/class-amp-theme-support.php

@@ -1561,25 +1561,6 @@ public static function ensure_required_markup( Document $dom, $script_handles =
 		}
 		$links[ Attribute::REL_PRELOAD ] = array_merge( $prioritized_preloads, $links[ Attribute::REL_PRELOAD ] );
 
-		// Add stylesheets for Bento components.
-		if ( amp_is_bento_enabled() ) {
-			foreach ( array_keys( $amp_scripts ) as $amp_script ) {
-				if ( ! wp_style_is( $amp_script, 'registered' ) ) {
-					continue;
-				}
-				$links[ Attribute::REL_STYLESHEET ][] = AMP_DOM_Utils::create_node(
-					$dom,
-					Tag::LINK,
-					[
-						Attribute::REL    => Attribute::REL_STYLESHEET,
-						Attribute::TYPE   => 'text/css',
-						Attribute::HREF   => wp_styles()->registered[ $amp_script ]->src,
-						'data-ampdevmode' => '',
-					]
-				);
-			}
-		}
-
 		/*
 		 * "4. Use preconnect to speedup the connection to other origin where the full resource URL is not known ahead of time,
 		 * for example, when using Google Fonts."