diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index abeaef0e95..7d3ff4a84b 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1496,21 +1496,18 @@ function comment_form( $args = array(), $post_id = null ) {
 	$defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p class="comment-form-author">' .
 																									'<label for="author">' . __( 'Name' ) . '</label> ' .
 																									( $req ? '<span class="required">*</span>' : '' ) .
-																									'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' .
-																									'</p><!-- #form-section-author .form-section -->',
+																									'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' /></p>',
 																							'email' => '<p class="comment-form-email">' .
 																										'<label for="email">' . __( 'Email' ) . '</label> ' .
 																										( $req ? '<span class="required">*</span>' : '' ) .
-																										'<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' />' .
-																										'</p><!-- #form-section-email .form-section -->',
+																										'<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' /></p>',
 																							'url' => '<p class="comment-form-url">' .
 																										'<label for="url">' . __( 'Website' ) . '</label>' .
-																										'<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" />' .
-																										'</p><!-- #form-section-url .form-section -->' ) ),
+																										'<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" /></p>' ) ),
 						'comment_field' => '<p class="comment-form-comment">' .
 												'<label for="comment">' . __( 'Comment' ) . '</label>' .
 												'<textarea id="comment" name="comment" cols="45" rows="8" tabindex="4" aria-required="true"></textarea>' .
-											'</p><!-- #form-section-comment .form-section -->',
+											'</p>',
 						'must_log_in' => '<p class="must-log-in">' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
 						'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
 						'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
@@ -1557,7 +1554,7 @@ function comment_form( $args = array(), $post_id = null ) {
 						<?php do_action( 'comment_form', $post_id ); ?>
 					</form>
 				<?php endif; ?>
-			</div>
+			</div><!-- #respond -->
 			<?php do_action( 'comment_form_after' ); ?>
 		<?php else : ?>
 			<?php do_action( 'comment_form_comments_closed' ); ?>