Update to new upstream API.