diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
index 1844bb0bf06..d07ba87f587 100644
--- a/includes/amp-helper-functions.php
+++ b/includes/amp-helper-functions.php
@@ -998,6 +998,12 @@ function amp_register_default_scripts( $wp_scripts ) {
 			$version = $extension_spec['latest'];
 		}
 
+		// Skip registering the amp-gfycat extension.
+		// @TODO: Remove this once the amp-gfycat extension is removed from spec.
+		if ( 'amp-gfycat' === $extension_name ) {
+			continue;
+		}
+
 		$src = sprintf(
 			'https://cdn.ampproject.org/v0/%s-%s.js',
 			$extension_name,
@@ -1408,7 +1414,6 @@ function amp_get_content_embed_handlers( $post = null ) {
 			AMP_TikTok_Embed_Handler::class       => [],
 			AMP_Tumblr_Embed_Handler::class       => [],
 			AMP_Gallery_Embed_Handler::class      => [],
-			AMP_Gfycat_Embed_Handler::class       => [],
 			AMP_Imgur_Embed_Handler::class        => [],
 			AMP_Scribd_Embed_Handler::class       => [],
 			AMP_WordPress_Embed_Handler::class    => [],
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
deleted file mode 100644
index d2982c3b357..00000000000
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Class AMP_Gfycat_Embed_Handler
- *
- * @package AMP
- * @since 1.0
- */
-
-/**
- * Class AMP_Gfycat_Embed_Handler
- *
- * @internal
- */
-class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
-	/**
-	 * Regex matched to produce output amp-gfycat.
-	 *
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?://(www\.)?gfycat\.com/.*#i';
-
-	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
-	}
-
-	/**
-	 * Filter oEmbed HTML for Gfycat to prepare it for AMP.
-	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
-	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'gfycat.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
-
-			if ( empty( $attr['height'] ) ) {
-				return $return;
-			}
-
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
-
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
-
-			$pieces = explode( '/detail/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-gfyid'] = $matches[1];
-			} else {
-				$attributes['data-gfyid'] = $pieces[1];
-			}
-
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-gfycat',
-				$attributes
-			);
-		}
-		return $return;
-	}
-}
-
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
index 2f5f0850cab..d9c5e0a3d8c 100644
--- a/includes/sanitizers/class-amp-style-sanitizer.php
+++ b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -346,7 +346,6 @@ class AMP_Style_Sanitizer extends AMP_Base_Sanitizer {
 		'amp-brightcove',
 		'amp-dailymotion',
 		'amp-delight-player',
-		'amp-gfycat',
 		'amp-ima-video',
 		'amp-mowplayer',
 		'amp-nexxtv-player',
diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
index 5e8e2a56f53..c42f1f20f84 100644
--- a/tests/php/test-amp-helper-functions.php
+++ b/tests/php/test-amp-helper-functions.php
@@ -1543,7 +1543,6 @@ public function test_amp_register_default_scripts_and_styles() {
 			'amp-fx-collection'            => 'v0/amp-fx-collection-0.1.js',
 			'amp-fx-flying-carpet'         => 'v0/amp-fx-flying-carpet-0.1.js',
 			'amp-geo'                      => 'v0/amp-geo-0.1.js',
-			'amp-gfycat'                   => 'v0/amp-gfycat-0.1.js',
 			'amp-gist'                     => 'v0/amp-gist-0.1.js',
 			'amp-google-document-embed'    => 'v0/amp-google-document-embed-0.1.js',
 			'amp-google-read-aloud-player' => 'v0/amp-google-read-aloud-player-0.1.js',
@@ -1714,7 +1713,6 @@ public function test_amp_register_default_scripts_and_styles_with_bento() {
 			'amp-fx-collection'            => 'v0/amp-fx-collection-0.1.js',
 			'amp-fx-flying-carpet'         => 'v0/amp-fx-flying-carpet-0.1.js',
 			'amp-geo'                      => 'v0/amp-geo-0.1.js',
-			'amp-gfycat'                   => 'v0/amp-gfycat-0.1.js',
 			'amp-gist'                     => 'v0/amp-gist-0.1.js',
 			'amp-google-document-embed'    => 'v0/amp-google-document-embed-0.1.js',
 			'amp-google-read-aloud-player' => 'v0/amp-google-read-aloud-player-0.1.js',
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
deleted file mode 100644
index 8c80d54838d..00000000000
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Test Gfycat embed.
- *
- * @package AMP.
- */
-
-use AmpProject\AmpWP\Tests\Helpers\WithoutBlockPreRendering;
-use AmpProject\AmpWP\Tests\TestCase;
-
-/**
- * Class AMP_Gfycat_Embed_Handler_Test
- *
- * @covers AMP_Gfycat_Embed_Handler
- */
-class AMP_Gfycat_Embed_Handler_Test extends TestCase {
-
-	use WithoutBlockPreRendering {
-		set_up as public prevent_block_pre_render;
-	}
-
-	/**
-	 * Set up.
-	 */
-	public function set_up() {
-		$this->prevent_block_pre_render();
-
-		// Mock the HTTP request.
-		add_filter(
-			'pre_oembed_result',
-			static function( $pre, $url ) {
-				if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
-					return $pre;
-				}
-
-				if ( false === strpos( $url, 'tautwhoppingcougar' ) ) {
-					return $pre;
-				}
-				return '<iframe src=\'https://gfycat.com/ifr/tautwhoppingcougar\' frameborder=\'0\' scrolling=\'no\' width=\'100\' height=\'100\'  allowfullscreen></iframe>';
-			},
-			10,
-			2
-		);
-	}
-
-	/**
-	 * Get conversion data.
-	 *
-	 * @return array
-	 */
-	public function get_conversion_data() {
-		return [
-			'no_embed'        => [
-				'<p>Hello world.</p>',
-				'<p>Hello world.</p>' . PHP_EOL,
-			],
-
-			'url_simple'      => [
-				'https://gfycat.com/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
-			],
-
-			'url_with_detail' => [
-				'https://gfycat.com/gifs/detail/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
-			],
-
-			'url_with_params' => [
-				'https://gfycat.com/gifs/detail/tautwhoppingcougar?foo=bar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
-			],
-
-		];
-	}
-
-	/**
-	 * Test conversion.
-	 *
-	 * @param string $source Source.
-	 * @param string $expected Expected.
-	 * @dataProvider get_conversion_data
-	 */
-	public function test__conversion( $source, $expected ) {
-		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
-		$filtered_content = apply_filters( 'the_content', $source );
-
-		$this->assertEquals( $expected, $filtered_content );
-	}
-
-	/**
-	 * Get scripts data.
-	 *
-	 * @return array
-	 */
-	public function get_scripts_data() {
-		return [
-			'not_converted' => [
-				'<p>Hello World.</p>',
-				[],
-			],
-			'converted'     => [
-				'https://www.gfycat.com/gifs/detail/tautwhoppingcougar' . PHP_EOL,
-				[ 'amp-gfycat' => true ],
-			],
-		];
-	}
-
-	/**
-	 * Test scripts.
-	 *
-	 * @param string $source Source.
-	 * @param string $expected Expected.
-	 * @dataProvider get_scripts_data
-	 */
-	public function test__get_scripts( $source, $expected ) {
-		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
-
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
-		$validating_sanitizer->sanitize();
-
-		$scripts = array_merge(
-			$embed->get_scripts(),
-			$validating_sanitizer->get_scripts()
-		);
-
-		$this->assertEquals( $expected, $scripts );
-	}
-}
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
index 52adaf8359f..4a077f2d9a3 100644
--- a/tests/php/test-tag-and-attribute-sanitizer.php
+++ b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -965,12 +965,6 @@ static function () {
 				[ 'amp-form' ],
 			],
 
-			'gfycat'                                       => [
-				'<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>',
-				'<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>',
-				[ 'amp-gfycat' ],
-			],
-
 			'h2'                                           => [
 				'<h2>Example Text</h2>',
 			],