rolling back some more events stuff