diff --git a/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql b/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql
index a70d883df..390dcf53d 100644
--- a/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql
+++ b/src/backend/columnar/sql/citus_columnar--11.1-0--11.1-1.sql
@@ -6,18 +6,14 @@ ALTER EXTENSION citus_columnar ADD TABLE columnar.options;
 ALTER EXTENSION citus_columnar ADD TABLE columnar.stripe;
 ALTER EXTENSION citus_columnar ADD TABLE columnar.chunk_group;
 ALTER EXTENSION citus_columnar ADD TABLE columnar.chunk;
-DO $proc$
-BEGIN
--- columnar functions
-IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
-    EXECUTE $$
-        ALTER EXTENSION citus_columnar ADD FUNCTION columnar.columnar_handler;
-        ALTER EXTENSION citus_columnar ADD ACCESS METHOD columnar;
-        ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_set;
-        ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_reset;
-    $$;
-END IF;
-END$proc$;
+
+ALTER EXTENSION citus_columnar ADD FUNCTION columnar.columnar_handler;
+ALTER EXTENSION citus_columnar ADD ACCESS METHOD columnar;
+ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_set;
+ALTER EXTENSION citus_columnar ADD FUNCTION pg_catalog.alter_columnar_table_reset;
+
 ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.upgrade_columnar_storage;
 ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.downgrade_columnar_storage;
 ALTER EXTENSION citus_columnar ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog;
+
+#include "../../columnar/sql/columnar--11.0-2--11.1-1.sql"
diff --git a/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql b/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql
index 81f3c7d3f..7adb863f1 100644
--- a/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql
+++ b/src/backend/columnar/sql/downgrades/citus_columnar--11.1-1--11.1-0.sql
@@ -1,3 +1,5 @@
+#include "../../../columnar/sql/downgrades/columnar--11.1-1--11.0-2.sql"
+
 -- detach relations from citus_columnar
 
 ALTER EXTENSION citus_columnar DROP SCHEMA columnar;
@@ -8,18 +10,10 @@ ALTER EXTENSION citus_columnar DROP TABLE columnar.stripe;
 ALTER EXTENSION citus_columnar DROP TABLE columnar.chunk_group;
 ALTER EXTENSION citus_columnar DROP TABLE columnar.chunk;
 
-DO $proc$
-BEGIN
--- columnar functions
-IF substring(current_Setting('server_version'), '\d+')::int >= 12 THEN
-    EXECUTE $$
-        ALTER EXTENSION citus_columnar DROP FUNCTION columnar.columnar_handler;
-        ALTER EXTENSION citus_columnar DROP ACCESS METHOD columnar;
-        ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_set;
-        ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_reset;
-    $$;
-END IF;
-END$proc$;
+ALTER EXTENSION citus_columnar DROP FUNCTION columnar.columnar_handler;
+ALTER EXTENSION citus_columnar DROP ACCESS METHOD columnar;
+ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_set;
+ALTER EXTENSION citus_columnar DROP FUNCTION pg_catalog.alter_columnar_table_reset;
 
 -- functions under citus_internal for columnar
 ALTER EXTENSION citus_columnar DROP FUNCTION citus_internal.upgrade_columnar_storage;
diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control
index 361bb8a12..996aaeb57 100644
--- a/src/backend/distributed/citus.control
+++ b/src/backend/distributed/citus.control
@@ -4,5 +4,3 @@ default_version = '11.1-1'
 module_pathname = '$libdir/citus'
 relocatable = false
 schema = pg_catalog
-
-requires = 'citus_columnar'
diff --git a/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql b/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
index baa4c565d..23c7c0540 100644
--- a/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
+++ b/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
@@ -38,5 +38,3 @@ BEGIN
 
   END IF;
 END $check_citus$;
-
-#include "../../columnar/sql/columnar--11.0-2--11.1-1.sql"
diff --git a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
index 71e9d6d89..c8bba83cd 100644
--- a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
+++ b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
@@ -46,8 +46,6 @@ CREATE FUNCTION pg_catalog.worker_repartition_cleanup(bigint)
  STRICT
 AS 'MODULE_PATHNAME', $function$worker_repartition_cleanup$function$;
 
-#include "../../../columnar/sql/downgrades/columnar--11.1-1--11.0-2.sql"
-
 -- add relations to citus
 ALTER EXTENSION citus ADD SCHEMA columnar;
 ALTER EXTENSION citus ADD SEQUENCE columnar.storageid_seq;