2786fb0f46
This reverts commit 0269562383.
This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.