diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index a8dbafd990bf..3a7309025b7d 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -99,7 +99,7 @@
     'pseudoconstant' => [
       'optionGroupName' => 'address_options',
     ],
-    'default' => '
1
2
3
4
5
6
8
9
10
11
12
',
+    'default' => '
1
2
3
4
5
6
8
9
10
',
     'add' => '4.1',
     'title' => ts('Address Fields'),
     'is_domain' => 1,
diff --git a/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
index 035806843aac..44e197be41ea 100644
--- a/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
+++ b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
@@ -103,8 +103,6 @@ public function testCreateWithLocBlock(): void {
       'postal_code' => '01903',
       'country_id' => 1228,
       'state_province_id' => 1029,
-      'geo_code_1' => '18.219023',
-      'geo_code_2' => '-105.00973',
       'manual_geo_code' => '0',
     ], $address);