Revert breaking changes in new event form