Many breaking changes expected upstream, we need to plan for them.