Index: bp-core/bp-core-filters.php
===================================================================
--- bp-core/bp-core-filters.php
+++ bp-core/bp-core-filters.php
@@ -62,7 +62,6 @@ add_filter( 'bp_template_include', 'bp_template_include_theme_supports', 2, 1 );
 add_filter( 'bp_template_include', 'bp_template_include_theme_compat',   4, 2 );
 
 // Run all template parts through additional template locations
-add_filter( 'bp_locate_template',   'bp_add_template_locations' );
 add_filter( 'bp_get_template_part', 'bp_add_template_locations' );
 
 // Turn comments off for BuddyPress pages
Index: bp-core/bp-core-template-loader.php
===================================================================
--- bp-core/bp-core-template-loader.php
+++ bp-core/bp-core-template-loader.php
@@ -64,24 +64,24 @@ function bp_locate_template( $template_names, $load = false, $require_once = tru
 	$located            = false;
 	$template_locations = bp_get_template_stack();
 
-	// Try to find a template file
-	foreach ( (array) $template_names as $template_name ) {
+	// Loop through template stack
+	foreach ( (array) $template_locations as $template_location ) {
 
-		// Continue if template is empty
-		if ( empty( $template_name ) )
+		// Continue if $template_location is empty
+		if ( empty( $template_location ) )
 			continue;
 
-		// Trim off any slashes from the template name
-		$template_name  = ltrim( $template_name, '/' );
+		// Try to find a template file
+		foreach ( (array) $template_names as $template_name ) {
 
-		// Loop through template stack
-		foreach ( (array) $template_locations as $template_location ) {
-
-			// Continue if $template_location is empty
-			if ( empty( $template_location ) )
+			// Continue if template is empty
+			if ( empty( $template_name ) )
 				continue;
 
-			// Check child theme first
+			// Trim off any slashes from the template name
+			$template_name  = ltrim( $template_name, '/' );
+
+			// See if template exists
 			if ( file_exists( trailingslashit( $template_location ) . $template_name ) ) {
 				$located = trailingslashit( $template_location ) . $template_name;
 				break 2;