Update to changed upstream API.