Adapt to new versions upstream.