diff --git a/src/wp-includes/class-walker-comment.php b/src/wp-includes/class-walker-comment.php
index 92115714ad..a43c73c11b 100644
--- a/src/wp-includes/class-walker-comment.php
+++ b/src/wp-includes/class-walker-comment.php
@@ -333,15 +333,21 @@ class Walker_Comment extends Walker {
 		<br />
 		<?php endif; ?>
 
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
+		<div class="comment-meta commentmetadata">
 			<?php
-				/* translators: 1: Comment date, 2: Comment time. */
-				printf( __( '%1$s at %2$s' ), get_comment_date( '', $comment ), get_comment_time() );
+			printf(
+				'<a href="%s">%s</a>',
+				esc_url( get_comment_link( $comment, $args ) ),
+				sprintf(
+					/* translators: 1: Comment date, 2: Comment time. */
+					__( '%1$s at %2$s' ),
+					get_comment_date( '', $comment ),
+					get_comment_time()
+				)
+			);
 			?>
-				</a>
-				<?php
-				edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
-				?>
+
+			<?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' ); ?>
 		</div>
 
 		<?php
@@ -427,14 +433,20 @@ class Walker_Comment extends Walker {
 					</div><!-- .comment-author -->
 
 					<div class="comment-metadata">
-						<a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
-							<time datetime="<?php comment_time( 'c' ); ?>">
-								<?php
-									/* translators: 1: Comment date, 2: Comment time. */
-									printf( __( '%1$s at %2$s' ), get_comment_date( '', $comment ), get_comment_time() );
-								?>
-							</time>
-						</a>
+						<?php
+						printf(
+							'<a href="%s"><time datetime="%s">%s</time></a>',
+							esc_url( get_comment_link( $comment, $args ) ),
+							get_comment_time( 'c' ),
+							sprintf(
+								/* translators: 1: Comment date, 2: Comment time. */
+								__( '%1$s at %2$s' ),
+								get_comment_date( '', $comment ),
+								get_comment_time()
+							)
+						);
+						?>
+
 						<?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .comment-metadata -->