Return to storing the ID instead of getting it from the identity.