This reverts commit 7960e814e5, reversing changes made to 3dd704ee9a. We no longer need this; please redo it as a proper MSC & synapse PR if you want to keep it...
7960e814e5
3dd704ee9a