He didn't have that sheath on his back in the first trailer, did they?
If I remember correctly, it just looked like he pulled out from under his "skirt" thing.
I might be realy off though.
I know it was in the second trailer though.