Index: /trunk/src/wp-includes/class-wp.php
===================================================================
--- /trunk/src/wp-includes/class-wp.php	(revision 64243)
+++ /trunk/src/wp-includes/class-wp.php	(revision 64244)
@@ -278,8 +278,6 @@
 				parse_str( $query, $perma_query_vars );
 
-				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' === $error ) {
-					unset( $error, $_GET['error'] );
-				}
+				// Clear the 404 error var since we found something.
+				unset( $error, $_GET['error'] );
 			}
 
Index: /trunk/tests/phpstan/baselines/identical.alwaysTrue.neon
===================================================================
--- /trunk/tests/phpstan/baselines/identical.alwaysTrue.neon	(revision 64243)
+++ /trunk/tests/phpstan/baselines/identical.alwaysTrue.neon	(revision 64244)
@@ -25,9 +25,4 @@
 			path: ../../../src/wp-admin/includes/class-file-upload-upgrader.php
 		-
-			message: '#^Strict comparison using \=\=\= between ''404'' and ''404'' will always evaluate to true\.$#'
-			identifier: identical.alwaysTrue
-			count: 1
-			path: ../../../src/wp-includes/class-wp.php
-		-
 			message: '#^Strict comparison using \=\=\= between true and true will always evaluate to true\.$#'
 			identifier: identical.alwaysTrue