Can you add a `// FIXME: remove this Encoder type after a snapshot` here?