Amended the fix for #22085: correctly flag the new feature as