Remove querystring dependency, it's in core