Mac-killer Nate Diaz returns from three years hiatus