Revert "Add ad-hoc handler. *crazy*"

This reverts commit 8e0ec624615577b5255993c906e0fbb0fa42c1a2.