Index: comment.php
===================================================================
--- comment.php	(revision 43556)
+++ comment.php	(working copy)
@@ -553,7 +553,7 @@
 		return;
 	}
 
-	if ( false === $cookies_consent ) {
+	if ( false === $cookies_consent && ! get_option( 'show_comments_cookies_opt_in' ) ) {
 		// Remove any existing cookies.
 		$past = time() - YEAR_IN_SECONDS;
 		setcookie( 'comment_author_' . COOKIEHASH, ' ', $past, COOKIEPATH, COOKIE_DOMAIN );
