Revert "Clean up after moving to win 8.1"

This reverts commit 6f76582dde2c24ceeeb310c7e5678527f6c50c55.
Revert "Revert "Clean up after moving to win 8.1""

This reverts commit 6a108272f3bb4a3d159f2309d82a1a839505be3a.