diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index 94b2c2d7..d1ad45e7 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -354,16 +354,6 @@ void Session::initialize()
                                           m_StreamConfig.width,
                                           m_StreamConfig.height,
                                           m_StreamConfig.fps);
-
-        // Oddly enough, the H.264 encoder on my GTX 1080 is actually more
-        // performant than the HEVC encoder (especially because split frame encode
-        // is disabled for HEVC by moonlight-common-c). Use H.264 for 1440p 100 FPS and above.
-        if (m_StreamConfig.width * m_StreamConfig.height * m_StreamConfig.fps >= 2560 * 1440 * 100) {
-            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                        "Preferring H.264 for higher performance");
-            m_StreamConfig.supportsHevc = false;
-        }
-
         m_StreamConfig.enableHdr = false;
         break;
     case StreamingPreferences::VCC_FORCE_H264:
diff --git a/moonlight-common-c/moonlight-common-c b/moonlight-common-c/moonlight-common-c
index 718d6a4b..b2ebba21 160000
--- a/moonlight-common-c/moonlight-common-c
+++ b/moonlight-common-c/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 718d6a4b28a209902848c8678207ab6a48474a63
+Subproject commit b2ebba2167a204808418f638d2066066d73a35d7