diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index ac7c00fbbc..ece96c4408 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -71,62 +71,6 @@ Scope(\_SB)
 
 		/* TRAP(71) */ /* TODO */
 
-		/* Determine the Operating System and save the value in OSYS.
-		 * We have to do this in order to be able to work around
-		 * certain windows bugs.
-		 *
-		 *    OSYS value | Operating System
-		 *    -----------+------------------
-		 *       2000    | Windows 2000
-		 *       2001    | Windows XP(+SP1)
-		 *       2002    | Windows XP SP2
-		 *       2006    | Windows Vista
-		 *       ????    | Windows 7
-		 */
-
-		/* Let's assume we're running at least Windows 2000 */
-		Store (2000, OSYS)
-
-		If (CondRefOf(_OSI)) {
-			If (_OSI("Windows 2001")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001 SP1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001 SP2")) {
-				Store (2002, OSYS)
-			}
-
-			If (_OSI("Windows 2001.1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001.1 SP1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2006")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2006.1")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2006 SP1")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2009")) {
-				Store (2009, OSYS)
-			}
-
-			If (_OSI("Windows 2012")) {
-				Store (2012, OSYS)
-			}
-		}
+		\GOS()
 	}
 }
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 2371eab70f..a8296cc677 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -46,62 +46,6 @@ Scope(\_SB)
 
 		/* TRAP(71) */ /* TODO  */
 
-		/* Determine the Operating System and save the value in OSYS.
-		 * We have to do this in order to be able to work around
-		 * certain windows bugs.
-		 *
-		 *    OSYS value | Operating System
-		 *    -----------+------------------
-		 *       2000    | Windows 2000
-		 *       2001    | Windows XP(+SP1)
-		 *       2002    | Windows XP SP2
-		 *       2006    | Windows Vista
-		 *       ????    | Windows 7
-		 */
-
-		/* Let's assume we're running at least Windows 2000 */
-		Store (2000, OSYS)
-
-		If (CondRefOf(_OSI)) {
-			If (_OSI("Windows 2001")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001 SP1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001 SP2")) {
-				Store (2002, OSYS)
-			}
-
-			If (_OSI("Windows 2001.1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2001.1 SP1")) {
-				Store (2001, OSYS)
-			}
-
-			If (_OSI("Windows 2006")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2006.1")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2006 SP1")) {
-				Store (2006, OSYS)
-			}
-
-			If (_OSI("Windows 2009")) {
-				Store (2009, OSYS)
-			}
-
-			If (_OSI("Windows 2012")) {
-				Store (2012, OSYS)
-			}
-		}
+		\GOS()
 	}
 }