fix: restore original event ordering

The underlying issue has been fixed upstream.

This reverts:
- c5b5f162 (#4431)
- 53342503 (#4646)

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>