diff --git a/modules/shortcodes/gist.php b/modules/shortcodes/gist.php
index 7c558c462173f..ba60f2399845e 100644
--- a/modules/shortcodes/gist.php
+++ b/modules/shortcodes/gist.php
@@ -201,22 +201,31 @@ class_exists( 'Jetpack_AMP_Support' )
 	}
 
 	// URL points to the entire gist, including the file name if there was one.
-	$id = ( ! empty( $file ) ? $id . '?file=' . $file : $id );
-
-	wp_enqueue_script(
-		'jetpack-gist-embed',
-		Assets::get_file_url_for_environment( '_inc/build/shortcodes/js/gist.min.js', 'modules/shortcodes/js/gist.js' ),
-		array( 'jquery' ),
-		JETPACK__VERSION,
-		true
-	);
+	$id     = ( ! empty( $file ) ? $id . '?file=' . $file : $id );
+	$return = false;
 
-	// inline style to prevent the bottom margin to the embed that themes like TwentyTen, et al., add to tables.
-	$return = sprintf(
-		'<style>.gist table { margin-bottom: 0; }</style><div class="gist-oembed" data-gist="%1$s" data-ts="%2$d"></div>',
-		esc_attr( $id ),
-		absint( $tab_size )
-	);
+	$request      = wp_remote_get( esc_url_raw( 'https://gist.github.com/' . esc_attr( $id ) ) );
+	$request_code = wp_remote_retrieve_response_code( $request );
+
+	if ( 200 === $request_code ) {
+		$request_body = wp_remote_retrieve_body( $request );
+		$request_data = json_decode( $request_body );
+
+		wp_enqueue_style( 'jetpack-gist-styling', esc_url( $request_data->stylesheet ), array(), JETPACK__VERSION );
+
+		$gist = substr_replace( $request_data->div, sprintf( 'style="tab-size: %1$s" ', absint( $tab_size ) ), 5, 0 );
+
+		// Add inline styles for the tab style in the opening div of the gist.
+		$gist = preg_replace(
+			'#(\<div\s)+(id=\"gist[0-9]+\")+(\sclass=\"gist\"\>)?#',
+			sprintf( '$1style="tab-size: %1$s" $2$3', absint( $tab_size ) ),
+			$request_data->div,
+			1
+		);
+
+		// Add inline style to prevent the bottom margin to the embed that themes like TwentyTen, et al., add to tables.
+		$return = sprintf( '<style>.gist table { margin-bottom: 0; }</style>%1$s', $gist );
+	}
 
 	if (
 		// No need to check for a nonce here, that's already handled by Core further up.
diff --git a/modules/shortcodes/js/gist.js b/modules/shortcodes/js/gist.js
deleted file mode 100644
index 4b8b7c10301c5..0000000000000
--- a/modules/shortcodes/js/gist.js
+++ /dev/null
@@ -1,32 +0,0 @@
-( function ( $, undefined ) {
-	var gistStylesheetLoaded = false,
-		gistEmbed = function () {
-			$( '.gist-oembed' ).each( function ( i, el ) {
-				var url = 'https://gist.github.com/' + $( el ).data( 'gist' ),
-					ts = parseInt( $( el ).data( 'ts' ), 10 );
-
-				$.ajax( {
-					url: url,
-					dataType: 'jsonp',
-				} ).done( function ( response ) {
-					if ( ts && 8 !== ts ) {
-						$( el ).replaceWith( $( response.div ).css( 'tab-size', ts.toString() ) );
-					} else {
-						$( el ).replaceWith( response.div );
-					}
-
-					if ( ! gistStylesheetLoaded ) {
-						var stylesheet =
-							'<link rel="stylesheet" href="' + response.stylesheet + '" type="text/css" />';
-
-						$( 'head' ).append( stylesheet );
-
-						gistStylesheetLoaded = true;
-					}
-				} );
-			} );
-		};
-
-	$( document ).ready( gistEmbed );
-	$( 'body' ).on( 'post-load', gistEmbed );
-} )( jQuery );
diff --git a/tests/php/modules/shortcodes/test-class.gist.php b/tests/php/modules/shortcodes/test-class.gist.php
index eb737051dd825..a48c018d2ac5c 100644
--- a/tests/php/modules/shortcodes/test-class.gist.php
+++ b/tests/php/modules/shortcodes/test-class.gist.php
@@ -89,7 +89,7 @@ public function test_shortcodes_gist_public_id_in_content() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -113,7 +113,7 @@ public function test_shortcodes_gist_public_id() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -137,7 +137,7 @@ public function test_shortcodes_gist_private_id_in_content() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -161,7 +161,7 @@ public function test_shortcodes_gist_private_id() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -185,7 +185,7 @@ public function test_shortcodes_gist_public_id_with_username() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . basename( $gist_id ) . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -209,7 +209,7 @@ public function test_shortcodes_gist_private_id_with_username() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . basename( $gist_id ) . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -241,7 +241,7 @@ public function test_shortcodes_gist_no_username_direct_file() {
 		);
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $expected_gist_id . '" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -278,7 +278,7 @@ public function test_shortcodes_gist_username_direct_file() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $expected_gist_id . '" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -347,7 +347,7 @@ public function test_shortcodes_gist_public_full_url() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -371,7 +371,7 @@ public function test_shortcodes_gist_public_full_url_in_content() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -395,7 +395,7 @@ public function test_shortcodes_gist_private_full_url() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . basename( $gist_id ) . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -419,7 +419,7 @@ public function test_shortcodes_gist_private_full_url_in_content() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . basename( $gist_id ) . '.json" data-ts="8"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $shortcode_content );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -451,7 +451,7 @@ public function test_shortcodes_gist_oembed_to_embed() {
 		ob_start();
 		the_content();
 		$actual = ob_get_clean();
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="8"></div>', $actual );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $actual );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -486,7 +486,7 @@ public function test_shortcodes_gist_file_to_embed() {
 		ob_start();
 		the_content();
 		$actual = ob_get_clean();
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . basename( $gist_id ) . '.json?file=wp-config.php" data-ts="8"></div>', $actual );
+		$this->assertContains( '<div style="tab-size: 8" id="gist', $actual );
 
 		// Test AMP version.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -512,7 +512,7 @@ public function test_shortcodes_gist_with_tab_size() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="4"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 4" id="gist', $shortcode_content );
 
 		// Test AMP version *lacks* tab size.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -536,7 +536,7 @@ public function test_shortcodes_gist_full_url_with_tab_size_in_content() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="4"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 4" id="gist', $shortcode_content );
 
 		// Test AMP version *lacks* tab size.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -560,7 +560,7 @@ public function test_shortcodes_gist_with_tab_size_in_attributes() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="4"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 4" id="gist', $shortcode_content );
 
 		// Test AMP version *lacks* tab size.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -584,7 +584,7 @@ public function test_shortcodes_gist_with_tab_size_in_attributes_override() {
 
 		// Test HTML version.
 		$shortcode_content = do_shortcode( $content );
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="4"></div>', $shortcode_content );
+		$this->assertContains( '<div style="tab-size: 4" id="gist', $shortcode_content );
 
 		// Test AMP version *lacks* tab size.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );
@@ -616,7 +616,7 @@ public function test_shortcodes_gist_oembed_with_tab_size() {
 		ob_start();
 		the_content();
 		$actual = ob_get_clean();
-		$this->assertContains( '<div class="gist-oembed" data-gist="' . $gist_id . '.json" data-ts="4"></div>', $actual );
+		$this->assertContains( '<div style="tab-size: 4" id="gist', $actual );
 
 		// Test AMP version *lacks* tab size.
 		add_filter( 'jetpack_is_amp_request', '__return_true' );