And this is why the movies should be allowed to be as non-canon as possible—not just labeled "non-canon," and then prohibited from moving the story in directions the manga never would (or at least in a direction in which the manga hasn't yet moved).
Have a character die, have secrets be revealed, etc.