Checking in from VS
Revert "Checking in from VS"

This reverts commit 4b5371caa6f5f4976079f8ec819b8134dde1c0b2.