Revert "Revert "Revert "Second Commit From Windows"""

This reverts commit de3032af73559d32411aba7f0e9019cf590a5ebe.