diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index a8780b9c2a..1b70b762d6 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1601,9 +1601,11 @@ function remove_accents( $string, $locale = '' ) {
 
 		// Unicode sequence normalization from NFD (Normalization Form Decomposed)
 		// to NFC (Normalization Form [Pre]Composed), the encoding used in this function.
-		if ( function_exists( 'normalizer_normalize' ) ) {
-			if ( ! normalizer_is_normalized( $string, Normalizer::FORM_C ) ) {
-				$string = normalizer_normalize( $string, Normalizer::FORM_C );
+		if ( function_exists( 'normalizer_is_normalized' )
+			&& function_exists( 'normalizer_normalize' )
+		) {
+			if ( ! normalizer_is_normalized( $string ) ) {
+				$string = normalizer_normalize( $string );
 			}
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2b0bd5e997..3bb0ae220e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-54811';
+$wp_version = '6.2-alpha-54813';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.