First off, it's not assuming he returns, he Will return. As of that I think he return at the wedding of Edge and Vickie depending when the have it. If they have it at SS or somewhere in Sept but, thats just me. That being said I can see him returning as the badass but, it's a hell of alot more likely he'll return as the Deadman. Plus, works with the storyline more if he does, so Deadman.