Revert "Undo changes to handler.go"

This reverts commit 24034e9f5c9935fac601d6af880735491040e108.