Merged windows branch. Revert "Merged windows branch." This reverts commit ceb070d993f49543aa26a0ce9bd7e1f9ffabe5f5.