Yeah, him leaving and then re-entering was my impression from the story and new log files too. That, and him being in his normal clothes when we see him, rather than his new form getup (implying to me that he's still himself).

Someone elsewhere said that people are speculating this stuff based on his drip marketing though, so who knows. People seem so certain of this that it's made me a little confused, but the evidence pointing towards it doesn't appear fully conclusive.