Could this get tagged with a `//FIXME #12628`?