Revert "Merge pull request #70 from matrix-org/daniel/guestnonevents"
Revert "Merge pull request #70 from matrix-org/daniel/guestnonevents"

This reverts commit 108f141f01ad83dc1f6aca51980176e911e5a2e5, reversing
changes made to 8c4018961b67facb86a8b35a11690324e031e35f.

matrix-org/sytest,matrix-org/sytest