Fit-again captain Kieran McGeeney has returned to the Armagh side, as expected, for Sunday's All-Ireland SFC semi-final against Tyrone at Croke Park.