Didi Gregorius’ return to the Yankees coming into focus