I heard talk of perhaps switching this scene to a “getting out of an uber, struggling to lift the case out of the trunk” type scene.

Also heard that it might perhaps be an bus shuttle type scene, with someone struggling to lift a bag out of the luggage container. Same deal, both scenes serve the joke of embarassing yourself in a public space— made worse by the fact that you’re preventing people from getting where they need to be with your flimsy arm muscles. 

As long as it keeps the bait and switch intact and we still have an “end environment” that makes sense, we are in business.