Undo changes to handler.go