Revert "Merge remote-tracking branch 'origin/feature/block-events' into feature/events"

This reverts commit 55f16e60cf6b8f53edc59cd293cd54555b6ee702, reversing
changes made to 8b77e7f85843c4e8c779ba853fd3f72477aef680.