Only until the next feature lands in upstream, likely accompanied by some refactoring.