Index: branches/5.1.x/core/install/upgrades.sql
===================================================================
diff -u -r13454 -r13470
--- branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13454)
+++ branches/5.1.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 13470)
@@ -1712,6 +1712,10 @@
 
 DROP TABLE ConfigurationAdmin;
 
+UPDATE ConfigurationValues
+SET ValueList = '=+||<SQL+>SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>'
+WHERE ValueList = '=+||<SQL>SELECT DestName AS OptionName, DestId AS OptionValue FROM <PREFIX>StdDestinations WHERE COALESCE(DestParentId, 0) = 0 ORDER BY OptionName</SQL>';
+
 ALTER TABLE Forms
 	ADD RequireLogin TINYINT NOT NULL DEFAULT '0',
 	ADD INDEX (RequireLogin),
