Index: bp-core/bp-core-filters.php
===================================================================
--- bp-core/bp-core-filters.php
+++ bp-core/bp-core-filters.php
@@ -61,9 +61,28 @@ add_filter( 'bp_core_render_message_content', 'shortcode_unautop' );
 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' );
+/** 
+ * Adds custom locations as set in {@link bp_get_template_locations()} to
+ * BuddyPress' template stack. 
+ * 
+ * @since BuddyPress (1.7) 
+ * 
+ * @uses bp_get_template_locations() Get the possible subdirectories to check for templates in 
+ * @return array All possible locations a template can reside in 
+ */ 
+function bp_template_stack_add_custom_locations( $stacks ) { 
+	$locations = array(); 
+	
+	foreach ( $stacks as $stack ) { 
+		// for each stack, add our custom location 
+		foreach ( bp_get_template_locations() as $custom_location ) { 
+			$locations[] = untrailingslashit( trailingslashit( $stack ) . $custom_location ); 
+		} 
+	} 
+	
+	return $locations; 
+} 
+add_filter( 'bp_get_template_stack', 'bp_template_stack_add_custom_locations' ); 
 
 // Turn comments off for BuddyPress pages
 add_filter( 'comments_open', 'bp_comments_open', 10, 2 );