diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 9410ff4874f9762538e01fd0ca40a0722f0783a3..b356ad11fea82686237dcd218563430290e0a562 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -774,12 +774,15 @@ listAllDbs(bool verbose)
 					  gettext_noop("Name"),
 					  gettext_noop("Owner"),
 					  gettext_noop("Encoding"));
+/* GPDB_84_MERGE_FIXME: datcollate and datctype have not been added yet */
+#if 0
 	if (pset.sversion >= 80400)
 		appendPQExpBuffer(&buf,
 						  "       d.datcollate as \"%s\",\n"
 						  "       d.datctype as \"%s\",\n",
 						  gettext_noop("Collation"),
 						  gettext_noop("Ctype"));
+#endif
 	appendPQExpBuffer(&buf, "       ");
 	printACLColumn(&buf, "d.datacl");
 	if (verbose && pset.sversion >= 80200)