They did speak of hero moments returning in forsaken.. but Im not sure if the token system was removed or not. It really does need to go, at least for the normal raid.. I honestly saw no issue with how the revives were handled in the D1 raids.