Per FCP changes on https://github.com/matrix-org/matrix-spec-proposals/pull/1767
Per FCP changes on matrix-org/matrix-spec-proposals#1767