This `FIXME` should be obsolete with this patch.