FS-5937: i need to build a test rig for this, go go gadget iphone commit
fix compiler warning vs2010
Revert "fix compiler warning vs2010" - Jeff is faster than I

This reverts commit fa9217117a9a729b424fde83fcc9a66a733a8282.