If he doesn't want to retire he should return for ONE last match to put over a new high flyer/luchador (Hunico, Neville, whatever), not return full time. Then he'll get hurt in a tag team house show match and they'll have to postpone it to the next WM or whatever and this has happened like three times already, lol.