Update to match API changes upstream.