This reverts commit 258e2e3ce8. This can be re-applied when Synapse decides to deprecate it.
258e2e3ce8