Can you add a `// FIXME: remove unwrap_ after a snapshot` comment here?