I agree with you in my head, but the execution did feel forced. I cannot place my finger on why exactly.

Maybe it is the lack of foreshadowing because this is obviously a retcon development.