diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -346,16 +346,9 @@
     m_use_dynamic = dynamic;
   }
 
-  const Timeout<std::micro> &GetTimeout() const {
-    assert(m_timeout && m_timeout->count() > 0);
-    return m_timeout;
-  }
+  const Timeout<std::micro> &GetTimeout() const { return m_timeout; }
 
-  void SetTimeout(const Timeout<std::micro> &timeout) {
-    // Disallow setting a non-zero timeout.
-    if (timeout && timeout->count() > 0)
-      m_timeout = timeout;
-  }
+  void SetTimeout(const Timeout<std::micro> &timeout) { m_timeout = timeout; }
 
   const Timeout<std::micro> &GetOneThreadTimeout() const {
     return m_one_thread_timeout;