diff --git a/.github/configuration/upgrade-test-configuration.yml b/.github/configuration/upgrade-test-configuration.yml
index 3fe93f4455..a6b0af1475 100644
--- a/.github/configuration/upgrade-test-configuration.yml
+++ b/.github/configuration/upgrade-test-configuration.yml
@@ -272,17 +272,5 @@ upgrade-version: [{
     }
   ],
   babelfishpg_tsql_server_collation_name: chinese_prc_ci_as
-},
-{
-  upgrade-path: [
-    {
-      version: 15.7,
-      upgrade-type: null
-    },
-    {
-      version: target.latest,
-      upgrade-type: major
-    }
-  ]
 }
 ]
\ No newline at end of file
diff --git a/contrib/babelfishpg_tsql/src/collation.c b/contrib/babelfishpg_tsql/src/collation.c
index 45e4fc609e..1210aa93a4 100644
--- a/contrib/babelfishpg_tsql/src/collation.c
+++ b/contrib/babelfishpg_tsql/src/collation.c
@@ -487,15 +487,15 @@ get_remove_accents_internal_oid()
 		return;
 
 #ifdef USE_ICU
-	// if (U_ICU_VERSION_MAJOR_NUM == pltsql_remove_accent_map_icu_major_version && U_ICU_VERSION_MINOR_NUM == pltsql_remove_accent_map_icu_min_version)
-	// {
+	if (U_ICU_VERSION_MAJOR_NUM == pltsql_remove_accent_map_icu_major_version && U_ICU_VERSION_MINOR_NUM == pltsql_remove_accent_map_icu_min_version)
+	{
 		elog(LOG, "Using cached mappings to remove accents");
 		remove_accents_internal_oid = LookupFuncName(list_make2(makeString("sys"), makeString("remove_accents_internal_using_cache")), -1, funcargtypes, true);
 		return;
-	// }
+	}
 #endif
-	// elog(LOG, "Using ICU function to remove accents");
-	// remove_accents_internal_oid = LookupFuncName(list_make2(makeString("sys"), makeString("remove_accents_internal")), -1, funcargtypes, true);
+	elog(LOG, "Using ICU function to remove accents");
+	remove_accents_internal_oid = LookupFuncName(list_make2(makeString("sys"), makeString("remove_accents_internal")), -1, funcargtypes, true);
 }
 
 /*