diff --git a/wp-includes/template.php b/wp-includes/template.php
index b9ac37d235..afc2ca6edf 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -707,7 +707,7 @@ function locate_template( $template_names, $load = false, $load_once = true, $ar
 		if ( file_exists( STYLESHEETPATH . '/' . $template_name ) ) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
-		} elseif ( file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
+		} elseif ( is_child_theme() && file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
 			$located = TEMPLATEPATH . '/' . $template_name;
 			break;
 		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ada65c247e..8eaf37976c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-alpha-56356';
+$wp_version = '6.4-alpha-56357';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.