this assumes a deprecation PR against 2.2, right?