Switch to needs_explicit_pk_field