rollback r594: restructuring to make event activation independent. changes are going to wait for api design svn:r612