diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 4b9c243..715dab7 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -1444,8 +1444,8 @@ function single_month_title($prefix = '', $display = true ) {
  * @param string $before Optional. Content to prepend to the title. Default empty.
  * @param string $after  Optional. Content to append to the title. Default empty.
  */
-function the_archive_title( $before = '', $after = '', $span_class = '' ) {
-	$title = get_the_archive_title( $span_class );
+function the_archive_title( $before = '', $after = '' ) {
+	$title = get_the_archive_title();
 
 	if ( ! empty( $title ) ) {
 		echo $before . $title . $after;
@@ -1459,47 +1459,25 @@ function the_archive_title( $before = '', $after = '', $span_class = '' ) {
  *
  * @return string Archive title.
  */
-function get_the_archive_title( $span_class = '' ) {
-	if ( is_category() || is_tag() || is_author() || is_year() || is_month() || is_day() || is_post_type_archive() || ( is_tax() && ! is_tax( 'post_format') ) ) {
-		if ( ! '' == $span_class ) {
-			$span_class = sprintf( 'class="%s"', $span_class );
-		}
-		if ( is_category() ) {
-			/* translators: Category archive title. 1: Category name */
-			$type = __( 'Category: ' );
-			$name = single_cat_title( '', false );
-		} elseif ( is_tag() ) {
-			/* translators: Tag archive title. 1: Tag name */
-			$type = __( 'Tag: ' );
-			$name = single_tag_title( '', false );
-		} elseif ( is_author() ) {
-			/* translators: Author archive title. 1: Author name */
-			$type = __( 'Author: ' );
-			$name = sprintf( '<span class="vcard">%s</span>', get_the_author() );
-		} elseif ( is_year() ) {
-			/* translators: Yearly archive title. 1: Year */
-			$type = __( 'Year: ' );
-			$name = get_the_date( _x( 'Y', 'yearly archives date format' ) );
-		} elseif ( is_month() ) {
-			/* translators: Monthly archive title. 1: Month name and year */
-			$type = __( 'Month: ' );
-			$name = get_the_date( _x( 'F Y', 'monthly archives date format' ) );
-		} elseif ( is_day() ) {
-			/* translators: Daily archive title. 1: Date */
-			$type =__( 'Day: ' );
-			$name = get_the_date( _x( 'F j, Y', 'daily archives date format' ) );
-		} elseif ( is_post_type_archive() ) {
-			/* translators: Post type archive title. 1: Post type name */
-			$type = __( 'Archives: ' );
-			$name = post_type_archive_title( '', false );
-		} elseif ( is_tax() ) {
-			$tax = get_taxonomy( get_queried_object()->taxonomy );
-			/* translators: Taxonomy term archive title. 1: Taxonomy singular name */
-			$type = sprintf( __( '%s: ' ), $tax->labels->singular_name );
-			$name =  single_term_title( '', false );
-		}
-		$format ='<span %s>%s</span>%s';
-		$title = sprintf( $format, $span_class, $type, $name );
+function get_the_archive_title() {
+	if ( is_category() ) {
+		/* translators: Category archive title. 1: Category name */
+		$title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
+	} elseif ( is_tag() ) {
+		/* translators: Tag archive title. 1: Tag name */
+		$title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
+	} elseif ( is_author() ) {
+		/* translators: Author archive title. 1: Author name */
+		$title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
+	} elseif ( is_year() ) {
+		/* translators: Yearly archive title. 1: Year */
+		$title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
+	} elseif ( is_month() ) {
+		/* translators: Monthly archive title. 1: Month name and year */
+		$title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
+	} elseif ( is_day() ) {
+		/* translators: Daily archive title. 1: Date */
+		$title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
 	} elseif ( is_tax( 'post_format' ) ) {
 		if ( is_tax( 'post_format', 'post-format-aside' ) ) {
 			$title = _x( 'Asides', 'post format archive title' );
@@ -1520,6 +1498,13 @@ function get_the_archive_title( $span_class = '' ) {
 		} elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
 			$title = _x( 'Chats', 'post format archive title' );
 		}
+	} elseif ( is_post_type_archive() ) {
+		/* translators: Post type archive title. 1: Post type name */
+		$title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
+	} elseif ( is_tax() ) {
+		$tax = get_taxonomy( get_queried_object()->taxonomy );
+		/* translators: Taxonomy term archive title. 1: Taxonomy singular name, 2: Current taxonomy term */
+		$title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
 	} else {
 		$title = __( 'Archives' );
 	}