diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index b87844b601..19585f37a2 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -588,10 +588,8 @@ function get_comment_link( $comment = null, $args = array() ) {
 	$comment = get_comment($comment);
 
 	// Backwards compat
-	if ( !is_array($args) ) {
-		$page = $args;
-		$args = array();
-		$args['page'] = $page;
+	if ( ! is_array( $args ) ) {
+		$args = array( 'page' => $args );
 	}
 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
@@ -1780,7 +1778,7 @@ class Walker_Comment extends Walker {
 		<br />
 		<?php endif; ?>
 
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
+		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 			<?php
 				/* translators: 1: date, 2: time */
 				printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
@@ -1822,7 +1820,7 @@ class Walker_Comment extends Walker {
 					</div><!-- .comment-author -->
 
 					<div class="comment-metadata">
-						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
+						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 							<time datetime="<?php comment_time( 'c' ); ?>">
 								<?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
 							</time>