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