Although, I expect this to break with the opt-in work. Would you mind adding a `FIXME(#13231)` so that I remember to update this code once the new opt-in work is done?