This reverts commit a06c28df (reland adb5c23f). The issue with PExpect tests on Windows should be fixed with e5e05ecf.