diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
index 2db330bd05..74141dc39c 100644
--- a/wp-content/themes/twentyfourteen/functions.php
+++ b/wp-content/themes/twentyfourteen/functions.php
@@ -434,7 +434,7 @@ function twentyfourteen_body_classes( $classes ) {
 		$classes[] = 'group-blog';
 	}
 
-	if ( get_header_image() || function_exists( 'has_header_video' ) && has_header_video() ) {
+	if ( get_header_image() ) {
 		$classes[] = 'header-image';
 	} elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ) ) ) {
 		$classes[] = 'masthead-fixed';
diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index 0a4953c5c2..7286d88938 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -32,11 +32,7 @@
 
 <body <?php body_class(); ?>>
 <div id="page" class="hfeed site">
-	<?php if ( function_exists( 'has_header_video' ) && has_header_video() ) : ?>
-		<div id="site-header">
-			<?php the_custom_header_markup(); ?>
-		</div>
-	<?php elseif ( get_header_image() ) : ?>
+	<?php if ( get_header_image() ) : ?>
 	<div id="site-header">
 		<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
 			<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>">
diff --git a/wp-content/themes/twentyfourteen/inc/custom-header.php b/wp-content/themes/twentyfourteen/inc/custom-header.php
index bb773077f6..287b10682d 100644
--- a/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -40,7 +40,6 @@ function twentyfourteen_custom_header_setup() {
 		'width'                  => 1260,
 		'height'                 => 240,
 		'flex-height'            => true,
-		'video'                  => true,
 		'wp-head-callback'       => 'twentyfourteen_header_style',
 		'admin-head-callback'    => 'twentyfourteen_admin_header_style',
 		'admin-preview-callback' => 'twentyfourteen_admin_header_image',
diff --git a/wp-content/themes/twentyfourteen/inc/customizer.php b/wp-content/themes/twentyfourteen/inc/customizer.php
index 954085594e..39289159b5 100644
--- a/wp-content/themes/twentyfourteen/inc/customizer.php
+++ b/wp-content/themes/twentyfourteen/inc/customizer.php
@@ -19,8 +19,6 @@ function twentyfourteen_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'blogname' )->transport          = 'postMessage';
 	$wp_customize->get_setting( 'blogdescription' )->transport   = 'postMessage';
 	$wp_customize->get_setting( 'header_textcolor' )->transport  = 'postMessage';
-	$wp_customize->get_setting( 'header_image' )->transport      = 'postMessage';
-	$wp_customize->get_setting( 'header_image_data' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial( 'blogname', array(
diff --git a/wp-content/themes/twentyfourteen/js/functions.js b/wp-content/themes/twentyfourteen/js/functions.js
index 2b83db0b3c..a21849ec35 100644
--- a/wp-content/themes/twentyfourteen/js/functions.js
+++ b/wp-content/themes/twentyfourteen/js/functions.js
@@ -95,15 +95,15 @@
 		 */
 		if ( _window.width() > 781 ) {
 			var mastheadHeight = $( '#masthead' ).height(),
-				mastheadOffset;
+				toolbarOffset, mastheadOffset;
 
 			if ( mastheadHeight > 48 ) {
 				body.removeClass( 'masthead-fixed' );
 			}
 
-			mastheadOffset = $( '#site-header' ).height();
-
 			if ( body.is( '.header-image' ) ) {
+				toolbarOffset  = body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
+				mastheadOffset = $( '#masthead' ).offset().top - toolbarOffset;
 
 				_window.on( 'scroll.twentyfourteen', function() {
 					if ( _window.scrollTop() > mastheadOffset && mastheadHeight < 49 ) {
@@ -112,19 +112,6 @@
 						body.removeClass( 'masthead-fixed' );
 					}
 				} );
-
-				// Update masthead offset once a custom header video loads.
-				$( document ).on( 'wp-custom-header-video-loaded', function() {
-					mastheadOffset = $( '#site-header' ).height();
-				} );
-
-
-				// Update masthead offset after a selective refresh.
-				if ( 'undefined' !== typeof wp && wp.customize && wp.customize.selectiveRefresh ) {
-					wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
-						mastheadOffset = $( '#site-header' ).height();
-					} );
-				}
 			}
 		}
 
diff --git a/wp-content/themes/twentyfourteen/style.css b/wp-content/themes/twentyfourteen/style.css
index d5c2c2f909..722583978b 100644
--- a/wp-content/themes/twentyfourteen/style.css
+++ b/wp-content/themes/twentyfourteen/style.css
@@ -88,7 +88,6 @@ canvas,
 video {
 	display: inline-block;
 	max-width: 100%;
-	height: auto;
 }
 
 html {
@@ -609,11 +608,6 @@ video {
 	max-width: 100%;
 }
 
-#wp-custom-header iframe,
-#wp-custom-header video {
-	margin-bottom: -8px;
-}
-
 p > embed,
 p > iframe,
 p > object,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f0543a5559..7c4ca20b7a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta3-39225';
+$wp_version = '4.7-beta3-39226';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
