Revert "Windows Code -22Dec2014"

This reverts commit 328d4a4164e2515f6ff8ac6eb1ce5153cb838eb4.
Revert "Revert "Windows Code -22Dec2014""

This reverts commit 7135a2a282b91d356889c3f7d3f5b819af596a8a.