Revert "Merge branch 'Event' into Final1.0"

This reverts commit 56ca3f4c51cb6bb809681165804336dec81cd63a, reversing
changes made to 1faacdec3363e0f1df70323065b29bed7e547c28.