If you are expecting this, you should call and tell them at the factory that is your wish before it's put in a box and ready for your pickup.
Quoted from Genjuro:
Fixing issues at the factory would be cheaper than dealing with shipping parts. Not sure what is so interesting about this to be honest.
..and they dont have to box it for me.