diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 1e9dda5b9e..a8b4c740a5 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -524,12 +524,15 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 29630 )
 		upgrade_400();
 
-	if ( $wp_current_db_version < 31351 )
-		upgrade_420();
-
+	// Don't harsh my mellow. upgrade_430() must be called before
+	// upgrade_420() to catch bad comments prior to any auto-expansion of
+	// MySQL column widths.
 	if ( $wp_current_db_version < 32364 )
 		upgrade_430();
 
+	if ( $wp_current_db_version < 31351 )
+		upgrade_420();
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();