Reversion fixes for Event.event_update for action == 'remove'
Merge branch 'events'