I'm going to mark this TODO as TODO(SCHEMA-154) so I don't forget to change this when I work on SCHEMA-154.