Revert "Syncing fork"

Reverts sagikazarmark/event#1