Also, this will probably go away with OIBT, so, feel free to add a `FIXME(#13231)`