Fit-again Hardik Pandya to make a comeback