diff --git a/src/backend/distributed/commands/role.c b/src/backend/distributed/commands/role.c
index 4c21b2f43..fbc131767 100644
--- a/src/backend/distributed/commands/role.c
+++ b/src/backend/distributed/commands/role.c
@@ -703,12 +703,12 @@ MakeSetStatementArguments(char *configurationName, char *configurationValue)
 	 * is no other way to determine allowed units, and value types other than
 	 * using this function
 	 */
-	struct config_generic **gucVariables = get_guc_variables();
-	int numOpts = GetNumConfigOptions();
+	 int                     gucCount;
+	struct config_generic **gucVariables = get_guc_variables(&gucCount);
 	struct config_generic **matchingConfig =
 		(struct config_generic **) SafeBsearch((void *) &key,
 											   (void *) gucVariables,
-											   numOpts,
+											   gucCount,
 											   sizeof(struct config_generic *),
 											   ConfigGenericNameCompare);
 
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index e7fedd1d8..381ea0000 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -2567,8 +2567,8 @@ RegisterCitusConfigVariables(void)
 static void
 OverridePostgresConfigAssignHooks(void)
 {
-	struct config_generic **guc_vars = get_guc_variables();
-	int gucCount = GetNumConfigOptions();
+	int			gucCount;
+	struct config_generic **guc_vars = get_guc_variables(&gucCount);
 
 	for (int gucIndex = 0; gucIndex < gucCount; gucIndex++)
 	{