diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index 98d4c46..2c32891 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -600,13 +600,7 @@
 
 QuicSpdyStream* QuicSpdySession::GetSpdyDataStream(
     const QuicStreamId stream_id) {
-  QuicStream* stream = nullptr;
-  if (GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_inline_getorcreatedynamicstream);
-    stream = GetOrCreateStream(stream_id);
-  } else {
-    stream = GetOrCreateDynamicStream(stream_id);
-  }
+  QuicStream* stream = GetOrCreateStream(stream_id);
   if (stream && stream->is_static()) {
     QUIC_BUG << "GetSpdyDataStream returns static stream";
     connection()->CloseConnection(
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 1ad070d..f4e3f8a 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1333,46 +1333,6 @@
   return unowned_pending;
 }
 
-QuicStream* QuicSession::GetOrCreateDynamicStream(
-    const QuicStreamId stream_id) {
-  DCHECK(!GetQuicReloadableFlag(quic_inline_getorcreatedynamicstream));
-  StreamMap::iterator it = stream_map_.find(stream_id);
-  if (it != stream_map_.end()) {
-    return it->second.get();
-  }
-
-  if (IsClosedStream(stream_id)) {
-    return nullptr;
-  }
-
-  if (!IsIncomingStream(stream_id)) {
-    HandleFrameOnNonexistentOutgoingStream(stream_id);
-    return nullptr;
-  }
-
-  // TODO(fkastenholz): If we are creating a new stream and we have
-  // sent a goaway, we should ignore the stream creation. Need to
-  // add code to A) test if goaway was sent ("if (goaway_sent_)") and
-  // B) reject stream creation ("return nullptr")
-
-  if (!MaybeIncreaseLargestPeerStreamId(stream_id)) {
-    return nullptr;
-  }
-
-  if (!VersionHasIetfQuicFrames(transport_version())) {
-    // TODO(fayang): Let LegacyQuicStreamIdManager count open streams and make
-    // CanOpenIncomingStream interface cosistent with that of v99.
-    if (!stream_id_manager_.CanOpenIncomingStream(
-            GetNumOpenIncomingStreams())) {
-      // Refuse to open the stream.
-      SendRstStream(stream_id, QUIC_REFUSED_STREAM, 0);
-      return nullptr;
-    }
-  }
-
-  return CreateIncomingStream(stream_id);
-}
-
 void QuicSession::set_largest_peer_created_stream_id(
     QuicStreamId largest_peer_created_stream_id) {
   if (VersionHasIetfQuicFrames(transport_version())) {
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index 96633d8..11db24d 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -520,15 +520,6 @@
   // Returns the number of open dynamic streams.
   uint64_t GetNumOpenDynamicStreams() const;
 
-  // Returns existing stream with id = |stream_id|. If no such stream exists,
-  // and |stream_id| is a peer-created id, then a new stream is created and
-  // returned. However if |stream_id| is a locally-created id and no such stream
-  // exists, the connection is closed.
-  // Caller does not own the returned stream.
-  // TODO(renjietang): Remove this method after
-  // quic_inline_getorcreatedynamicstream is deprecated.
-  QuicStream* GetOrCreateDynamicStream(QuicStreamId stream_id);
-
   // Performs the work required to close |stream_id|.  If |locally_reset|
   // then the stream has been reset by this endpoint, not by the peer.
   virtual void CloseStreamInner(QuicStreamId stream_id, bool locally_reset);
