Revert "1. custom event fix"

This reverts commit 2ece73b238d9873576f6fc99dd5233a5f4d9c278.