Yup, knew it. Glad to see it, though. I was really worried it was one of those stupid "He's brainwashed.. I need to fight meh Daddy! Dad, remember me, fight it... uWu!! Power of friendship and nakama, Activate!!!"
None of that crap, "Yeah, I'm me. Screw the bad guys, I've been killing you all this time. Ha, let's go son!" - That's the way to do it.