Revert "  Squash vsprintf from upstream"

This reverts commit a6cfceeb00402a79de5ae79276db105ceca1a1b4.