From 2a012e8a049858fe379599207fac34b6b2e11101 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Fri, 30 Aug 2019 17:13:37 +0100
Subject: [PATCH] Revert "Add m.id_access_token flag (#5930)" (#5945)

This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
---
 changelog.d/5930.misc           | 1 -
 synapse/rest/client/versions.py | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 changelog.d/5930.misc

diff --git a/changelog.d/5930.misc b/changelog.d/5930.misc
deleted file mode 100644
index 81dcc10e6..000000000
--- a/changelog.d/5930.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add temporary flag to /versions in unstable_features to indicate this Synapse supports receiving id_access_token parameters on calls to identity server-proxying endpoints.
\ No newline at end of file
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index c51c9e617..0e0919163 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -44,12 +44,7 @@ class VersionsRestServlet(RestServlet):
                     "r0.5.0",
                 ],
                 # as per MSC1497:
-                "unstable_features": {
-                    "m.lazy_load_members": True,
-                    # as per https://github.com/matrix-org/synapse/issues/5927
-                    # to be removed in r0.6.0
-                    "m.id_access_token": True,
-                },
+                "unstable_features": {"m.lazy_load_members": True},
             },
         )