even more upstream API changes