until the API changes again