Gary Kirsten will make a surprise return to the South Africa team as a 'batting mentor', just months after resigning as coach.