Didi Gregorius rejoins Joe Girardi