diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 99eb936ed6..c2933b2d98 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -11,7 +11,6 @@ namespace BizHawk.Client.Common
 		public static GameInfo Game;
 		public static CheatCollection CheatList;
 		public static FirmwareManager FirmwareManager;
-		public static Rewinder Rewinder;
 
 		public static IMovieSession MovieSession = new MovieSession();
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index d3e6a8fb31..ea690b585d 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1035,7 +1035,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Emulator.HasSavestates())
 			{
-				using var form = new RewindConfig(Global.Rewinder, Config, Emulator.AsStatable());
+				using var form = new RewindConfig(Rewinder, Config, Emulator.AsStatable());
 				AddOnScreenMessage(form.ShowDialog().IsOk()
 					? "Rewind and State settings saved"
 					: "Rewind config aborted");
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 8002439c63..5162343ea3 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -830,11 +830,7 @@ namespace BizHawk.Client.EmuHawk
 		private AutoFireStickyXorAdapter AutofireStickyXORAdapter => Global.AutofireStickyXORAdapter;
 		private ClickyVirtualPadController ClickyVirtualPadController => Global.ClickyVirtualPadController;
 
-		private Rewinder Rewinder
-		{
-			get => Global.Rewinder;
-			set => Global.Rewinder = value;
-		}
+		private Rewinder Rewinder { get; }
 
 		private FirmwareManager FirmwareManager => Global.FirmwareManager;
 		private Controller ClientControls => Global.ClientControls;