API changes for making this a pure HTTP client