Did he die again in the end? I honestly have a memory hole in season 8 and much of season 7, despite having watched the entire show twice (the earlier seasons multiple times before that, but I only did a single rewatch after the whole thing was over)