Revert "add handler"

This reverts commit 9872391facb9df5023e0ce8670f07b8c52e63a2e.