Move setting of request.fs out of dispatcher