Fix double-free of events caused by bad merge

Note to self: Don't open pull requests for 2-second fixes unless you're
prepared to deal with merge confusion like this when the pull request
gets closed due to "already did this fix"