Post #2154631

@ludman1 @daniel @mactunag @j_r @joinjabber It won't be necessary anymore once this MSC is supported: https://github.com/matrix-org/matrix-spec-proposals/pull/4174