diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 81d36c3c2e..0404478edb 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -661,13 +661,10 @@ function get_blog_post( $blog_id, $post_id ) {
 	return $post;
 }
 
+// deprecated, see clean_post_cache()
 function clear_global_post_cache( $post_id ) {
-	global $wpdb;
-
-	wp_cache_delete( $wpdb->blogid . '-' . $post_id, 'global-posts' );
+	return;
 }
-add_action( 'publish_post', 'clear_global_post_cache' );
-add_action( 'delete_post', 'clear_global_post_cache' );
 
 function add_user_to_blog( $blog_id, $user_id, $role ) {
 	switch_to_blog($blog_id);
diff --git a/wp-includes/post.php b/wp-includes/post.php
index f070bb69c1..c168f36c73 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -3672,6 +3672,9 @@ function clean_post_cache($id) {
 		foreach( $children as $cid )
 			clean_post_cache( $cid );
 	}
+
+	if ( is_multisite() )
+		wp_cache_delete( $wpdb->blogid . '-' . $id, 'global-posts' );
 }
 
 /**