Undo commit 6bc2698

Change back to BlockFormEvent