Merge "Revert change to win32 isatty stub"