Adapt to upstream changes.