diff --git a/main.cpp b/main.cpp
index ff01ab5..041e7a1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -211,13 +211,8 @@ void MoonlightInstance::HandleStartStream(int32_t callbackId, pp::VarArray args)
     m_StreamConfig.height = stoi(height);
     m_StreamConfig.fps = stoi(fps);
     m_StreamConfig.bitrate = stoi(bitrate); // kilobits per second
-    m_StreamConfig.streamingRemotely = 0;
     m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_STEREO;
-    
-    // The overhead of receiving a packet is much higher in NaCl because we must
-    // pass through various layers of abstraction on each recv() call. We're using a
-    // higher than normal default video packet size here to reduce CPU cycles wasted
-    // receiving packets. The possible cost is greater network losses.
+    m_StreamConfig.streamingRemotely = STREAM_CFG_AUTO;
     m_StreamConfig.packetSize = 1392;
     
     // Load the rikey and rikeyid into the stream configuration
diff --git a/moonlight-common-c b/moonlight-common-c
index dd49e5b..610c00b 160000
--- a/moonlight-common-c
+++ b/moonlight-common-c
@@ -1 +1 @@
-Subproject commit dd49e5bbfd116d708b35f94d8aa165ce061f39ec
+Subproject commit 610c00bf2d54698a13eb1b84d27b7e927a157a40