Revert "Fix stream events"

This reverts commit 0b32a2686f8c9baa653e62b8864a589f3fdfb85a.