From 638dde2f84f688ff85b5265f3c8ae0b2e385c690 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 27 Jan 2022 08:20:00 -0500
Subject: [PATCH 1/2] Remove the obsolete MSC1849 flag.

---
 synapse/config/experimental.py              | 2 --
 synapse/storage/databases/main/relations.py | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index dbaeb1091861..65c807a19af7 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -24,8 +24,6 @@ class ExperimentalConfig(Config):
     def read_config(self, config: JsonDict, **kwargs):
         experimental = config.get("experimental_features") or {}
 
-        # Whether to enable experimental MSC1849 (aka relations) support
-        self.msc1849_enabled = config.get("experimental_msc1849_support_enabled", True)
         # MSC3440 (thread relation)
         self.msc3440_enabled: bool = experimental.get("msc3440_enabled", False)
 
diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py
index a9a5dd5f03b6..37468a518381 100644
--- a/synapse/storage/databases/main/relations.py
+++ b/synapse/storage/databases/main/relations.py
@@ -75,7 +75,6 @@ def __init__(
     ):
         super().__init__(database, db_conn, hs)
 
-        self._msc1849_enabled = hs.config.experimental.msc1849_enabled
         self._msc3440_enabled = hs.config.experimental.msc3440_enabled
 
     @cached(tree=True)
@@ -683,9 +682,6 @@ async def get_bundled_aggregations(
             A map of event ID to the bundled aggregation for the event. Not all
             events may have bundled aggregations in the results.
         """
-        # If bundled aggregations are disabled, nothing to do.
-        if not self._msc1849_enabled:
-            return {}
 
         # TODO Parallelize.
         results = {}

From 3660a4c994984eafd774ec03969aac9fb9b7c9e3 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 27 Jan 2022 08:27:32 -0500
Subject: [PATCH 2/2] Newsfragment

---
 changelog.d/11843.removal | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/11843.removal

diff --git a/changelog.d/11843.removal b/changelog.d/11843.removal
new file mode 100644
index 000000000000..d6d49b4ad50b
--- /dev/null
+++ b/changelog.d/11843.removal
@@ -0,0 +1 @@
+Remove the `experimental_msc1849_support_enabled` flag as the features are now stable.