It should've been Bucky, not Falcon

I was fine with. It's a tall order given that Falcon's an ordinary guy, but I got the sense several movies ago that taking on Sam was never about training a partner, but a replacement.