Index: trunk/src/wp-includes/functions.php
===================================================================
--- trunk/src/wp-includes/functions.php	(revision 64305)
+++ trunk/src/wp-includes/functions.php	(revision 64347)
@@ -9346,8 +9346,4 @@
 	$args = apply_filters( 'wp_admin_notice_args', $args, $message );
 
-	// Unique ID is intended for internal use, and is not a filterable argument.
-	$unique_id         = wp_unique_prefixed_id( 'wp-admin-notice-' );
-	$args['notice_id'] = $unique_id;
-
 	$wrap_with_p  = false !== $args['paragraph_wrap'];
 	$wrap_opener  = $wrap_with_p ? '<p>' : '';
@@ -9359,13 +9355,7 @@
 		$trimmed_id = trim( $args['id'] );
 
-		$html_builder->set_attribute( 'data-id', $unique_id );
 		if ( '' !== $trimmed_id ) {
 			$html_builder->set_attribute( 'id', $trimmed_id );
-		} else {
-			$html_builder->set_attribute( 'id', $unique_id );
-		}
-	} else {
-		$html_builder->set_attribute( 'data-id', $unique_id );
-		$html_builder->set_attribute( 'id', $unique_id );
+		}
 	}