Revert "Use Timeout.NONE for plain streams to avoid throwing InterruptedIOException"

This reverts commit 3c64fbfe9e49cec295af1e2f5391d1982d71a9b0.