Revert "windows_2"

This reverts commit 0ec1f17d32c8f48520407f4ada19fea2cd767e42.
Revert "Revert "windows_2""

This reverts commit 84cb934714630a0d7ab7c81d9013f215f23c8289.
andy