Submitted by @​matthew:matrix.org this seems needlessly leaky (Imported from https://matrix.org/jira/browse/SPEC-374)