Adapt to upstream change