diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index 67bd33e677..1380422d4a 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -879,6 +879,7 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 		'type'       => $args['type'],
 		'post_id'    => $comment->comment_post_ID,
 		'fields'     => 'ids',
+		'count'      => true,
 		'status'     => 'approve',
 		'date_query' => array(
 			array(
@@ -888,8 +889,8 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 		),
 	);
 
-	$older_comment_ids = get_comments( $comment_args );
-	$older_comment_count = count( $older_comment_ids );
+	$comment_query = new WP_Comment_Query();
+	$older_comment_count = $comment_query->query( $comment_args );
 
 	// No older comments? Then it's page #1.
 	if ( 0 == $older_comment_count )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6d22b53b88..e48c95d995 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34660';
+$wp_version = '4.4-alpha-34661';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.