Revert "Fix m.federate bug"

This has now been merged into develop (142c9325c) so we no longer need this
cherry-picked commit.

This reverts commit ee91c69ef792c3db7b4438d17e38f343f9c10b72.

2 files changed, 2 insertions, 2 deletions

diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py

index 4a962d97c9..921735edb3 100644
--- a/synapse/handlers/stats.py
+++ b/synapse/handlers/stats.py
@@ -260,7 +260,7 @@ class StatsHandler(StateDeltasHandler):
                         room_stats_delta["local_users_in_room"] += delta
 
             elif typ == EventTypes.Create:
-                room_state["is_federatable"] = event_content.get("m.federate", True) is True
+                room_state["is_federatable"] = event_content.get("m.federate", True)
                 if sender and self.is_mine_id(sender):
                     user_to_stats_deltas.setdefault(sender, Counter())[
                         "rooms_created"
diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py

index 8ba7051086..6560173c08 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -823,7 +823,7 @@ class StatsStore(StateDeltasStore):
             elif event.type == EventTypes.CanonicalAlias:
                 room_state["canonical_alias"] = event.content.get("alias")
             elif event.type == EventTypes.Create:
-                room_state["is_federatable"] = event.content.get("m.federate", True) is True
+                room_state["is_federatable"] = event.content.get("m.federate", True)
 
         yield self.update_room_state(room_id, room_state)