Then the proper way to do this here is to handle both cases and fallback to the old code.

Or we merge both PRs simultaneously. Would that work?