Revert 21e730a..2f34d21

This rolls back to commit 21e730a29fca5cbbc8d0b42c56609c3594fad97b.
Event Edit and Update working