diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index e4a39d80b..aca98bdb3 100644
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -42,8 +42,7 @@ echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>'
 <?php do_action('comments_atom_head'); ?>
 <?php
 if ( have_comments() ) : while ( have_comments() ) : the_comment();
-	$comment_post = get_post($comment->comment_post_ID);
-	get_post_custom($comment_post->ID);
+	$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
 ?>
 	<entry>
 		<title><?php
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index 74715b80e..26d3325d5 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -34,8 +34,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 	<?php do_action('commentsrss2_head'); ?>
 <?php
 if ( have_comments() ) : while ( have_comments() ) : the_comment();
-	$comment_post = get_post($comment->comment_post_ID);
-	get_post_custom($comment_post->ID);
+	$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
 ?>
 	<item>
 		<title><?php