Refactor from Requestish to http.Request, fixes