No, he should have stayed retired. I don't think he's really done anything helpful since he returned. Just a filler here and there. He should have stayed commentating, he wasn't bad at that. Or a GM or someone's manager, but not wrestle. I thought it would have been good for him to work with Cade and be his manager, that would have been a perfect team up. And him re-igniting his feud with Cena ruined what it was before. They way it ended on Smackdown was perfect. It helped elevated Cena to be a true main eventer, got him his 1st WWE title reign, and the matches they had were epic. Especially the I Quit match. It should have ended there. The storyline he's in now is the only good one he's had since coming back. I didn't like it 1st cause it didn't make since, and I still don't think it's the best, but it's decent. And it's pretty obvious how it's going to end, HBK gets fed up, super kicks JBL, they have their matches, the end.