diff --git a/themes/wporg-5ftf/functions.php b/themes/wporg-5ftf/functions.php
index c769c1f..9010367 100644
--- a/themes/wporg-5ftf/functions.php
+++ b/themes/wporg-5ftf/functions.php
@@ -172,6 +172,14 @@ function custom_body_class( $classes ) {
 }
 add_filter( 'body_class', __NAMESPACE__ . '\custom_body_class' );
 
+/**
+ * Swaps out the no-js for the js body class if the browser supports Javascript.
+ */
+function nojs_body_tag() {
+	echo "<script>document.body.className = document.body.className.replace('no-js','js');</script>\n";
+}
+add_action( 'wp_body_open', __NAMESPACE__ . '\nojs_body_tag' );
+
 /**
  * Filters an enqueued script & style's fully-qualified URL.
  *
diff --git a/themes/wporg-5ftf/header.php b/themes/wporg-5ftf/header.php
index 6a7b760..82c250f 100644
--- a/themes/wporg-5ftf/header.php
+++ b/themes/wporg-5ftf/header.php
@@ -2,18 +2,11 @@
 
 namespace WordPressDotOrg\FiveForTheFuture\Theme;
 
+\WordPressdotorg\skip_to( '#main' );
+
 if ( FEATURE_2021_GLOBAL_HEADER_FOOTER ) {
 	echo do_blocks( '<!-- wp:wporg/global-header /-->' );
 } else {
-	global $wporg_global_header_options;
-	$GLOBALS['pagetitle'] = wp_get_document_title();
-
-	if ( ! isset( $wporg_global_header_options['in_wrapper'] ) ) {
-		$wporg_global_header_options['in_wrapper'] = '';
-	}
-
-	$wporg_global_header_options['in_wrapper'] .= '<a class="skip-link screen-reader-text" href="#main">' . esc_html__( 'Skip to content', 'wporg-5ftf' ) . '</a>';
-
 	require WPORGPATH . 'header.php';
 }