Revert 32bface..725c626

This rolls back to commit 32bface6b87ddd3845dd1e1f41713a6196146e6b.
Model for events