From acebf2621c375ada854a4488bdebcbcb0635f212 Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Fri, 21 Sep 2018 15:38:52 +0100
Subject: [PATCH] Manual reversion of PR #1277

---
 BizHawk.Client.Common/Global.cs                                 | 2 --
 .../movie/conversions/MovieConversionExtensions.cs              | 2 --
 2 files changed, 4 deletions(-)

diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 0969dbc0b6..552f61a591 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -87,8 +87,6 @@ namespace BizHawk.Client.Common
 						return SystemInfo.Intellivision;
 					case "SG":
 						return SystemInfo.SG;
-                    case "GG":
-                        return SystemInfo.GG;
 					case "SMS":
 						if ((Emulator as SMS).IsGameGear)
 						{
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index 9b0aa4aedf..dd5c1e36c4 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -319,13 +319,11 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsSG1000)
 			{
 				movie.HeaderEntries.Add("IsSGMode", "1");
-                movie.SystemID = "SG";
             }
 
 			if (Global.Emulator is SMS && (Global.Emulator as SMS).IsGameGear)
 			{
 				movie.HeaderEntries.Add("IsGGMode", "1");
-                movie.SystemID = "GG";
 			}
 
 			if (Global.Emulator is GPGX && (Global.Emulator as GPGX).IsMegaCD)