Revert "Use triggerHandler instead of trigger."

This reverts commit bfb1eb953cd4536dbcdc5bb35c77f6f23e85e909.