e5b3ec83b3
This reverts commit 271fedd1e9.
This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.