diff --git a/src/BizHawk.Client.Common/Controller.cs b/src/BizHawk.Client.Common/Controller.cs
index 29528e74de..f9d483a759 100644
--- a/src/BizHawk.Client.Common/Controller.cs
+++ b/src/BizHawk.Client.Common/Controller.cs
@@ -49,14 +49,30 @@ namespace BizHawk.Client.Common
 				.SelectMany(kvp => kvp.Value)
 				.Any(boundButton => boundButton == button);
 
-		public void NormalizeAxes()
+		/// <summary>
+		/// uses the bindings to latch our own logical button state from the source controller's button state (which are assumed to be the physical side of the binding).
+		/// this will clobber any existing data (use OR_* or other functions to layer in additional input sources)
+		/// </summary>
+		public void LatchFromPhysical(IController finalHostController)
 		{
+			_buttons.Clear();
+			
+			foreach (var kvp in _bindings)
+			{
+				_buttons[kvp.Key] = false;
+				foreach (var button in kvp.Value)
+				{
+					if (finalHostController.IsPressed(button))
+					{
+						_buttons[kvp.Key] = true;
+					}
+				}
+			}
+
 			foreach (var kvp in _axisBindings)
 			{
-				var range = _axisRanges[kvp.Key];
-
-				// values of _axes are ints in -10000..10000 (or 0..10000), so scale to -1..1, using floats to keep fractional part
-				var value = _axes[kvp.Key] / 10000.0f;
+				// values from finalHostController are ints in -10000..10000 (or 0..10000), so scale to -1..1, using floats to keep fractional part
+				var value = finalHostController.AxisValue(kvp.Value.Value) / 10000.0f;
 
 				// apply deadzone (and scale diminished range back up to -1..1)
 				var deadzone = kvp.Value.Deadzone;
@@ -69,6 +85,7 @@ namespace BizHawk.Client.Common
 				value *= kvp.Value.Mult;
 
 				// -1..1 -> range
+				var range = _axisRanges[kvp.Key];
 				value *= Math.Max(range.Neutral - range.Min, range.Max - range.Neutral);
 				value += range.Neutral;
 
@@ -77,35 +94,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		/// <summary>
-		/// uses the bindings to latch our own logical button state from the source controller's button state (which are assumed to be the physical side of the binding).
-		/// this will clobber any existing data (use OR_* or other functions to layer in additional input sources)
-		/// </summary>
-		public void LatchFromPhysical(IController controller)
-		{
-			_buttons.Clear();
-			
-			foreach (var kvp in _bindings)
-			{
-				_buttons[kvp.Key] = false;
-				foreach (var button in kvp.Value)
-				{
-					if (controller.IsPressed(button))
-					{
-						_buttons[kvp.Key] = true;
-					}
-				}
-			}
-
-			foreach (var kvp in _axisBindings)
-			{
-				_axes[kvp.Key] = controller.AxisValue(kvp.Value.Value);
-			}
-
-			// it's not sure where this should happen, so for backwards compatibility.. do it every time
-			NormalizeAxes();
-		}
-
 		public void ApplyAxisConstraints(string constraintClass)
 			=> Definition.ApplyAxisConstraints(constraintClass, _axes);