diff --git a/src/backend/distributed/commands/role.c b/src/backend/distributed/commands/role.c
index fbc131767..331c9f33d 100644
--- a/src/backend/distributed/commands/role.c
+++ b/src/backend/distributed/commands/role.c
@@ -820,7 +820,7 @@ GenerateGrantRoleStmtsFromOptions(RoleSpec *roleSpec, List *options)
 
 		if (strcmp(option->defname, "adminmembers") == 0)
 		{
-			grantRoleStmt->admin_opt = true;
+			/* TODO: PG commit */
 		}
 
 		stmts = lappend(stmts, grantRoleStmt);
@@ -868,8 +868,6 @@ GenerateGrantRoleStmtsOfRole(Oid roleid)
 
 		grantRoleStmt->grantor = NULL;
 
-		grantRoleStmt->admin_opt = membership->admin_option;
-
 		stmts = lappend(stmts, grantRoleStmt);
 	}
 
diff --git a/src/backend/distributed/deparser/deparse_role_stmts.c b/src/backend/distributed/deparser/deparse_role_stmts.c
index 0e9b300bb..ea24c4563 100644
--- a/src/backend/distributed/deparser/deparse_role_stmts.c
+++ b/src/backend/distributed/deparser/deparse_role_stmts.c
@@ -349,9 +349,9 @@ AppendGrantRoleStmt(StringInfo buf, GrantRoleStmt *stmt)
 {
 	appendStringInfo(buf, "%s ", stmt->is_grant ? "GRANT" : "REVOKE");
 
-	if (!stmt->is_grant && stmt->admin_opt)
+	if (!stmt->is_grant && false)
 	{
-		appendStringInfo(buf, "ADMIN OPTION FOR ");
+			/* TODO PG commit: e3ce2de09d814f8770b2e3b3c152b7671bcdb83f*/
 	}
 
 	AppendRoleList(buf, stmt->granted_roles);
@@ -362,9 +362,9 @@ AppendGrantRoleStmt(StringInfo buf, GrantRoleStmt *stmt)
 
 	if (stmt->is_grant)
 	{
-		if (stmt->admin_opt)
+		if (false)
 		{
-			appendStringInfo(buf, " WITH ADMIN OPTION");
+			/* TODO PG commit: e3ce2de09d814f8770b2e3b3c152b7671bcdb83f*/
 		}
 
 		if (stmt->grantor)