diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index ea043ee..0301034 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -183,6 +183,7 @@
 				// AVX2 is not correctly detected on Windows. Fall back on other
 				// dimensions to ensure that we correctly target machines which we know
 				// have AVX2 support.
+				d["cpu"] = "x86-64"
 				d["os"] = "Windows-2008ServerR2-SP1"
 			}
 		} else {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bb69778..cc6f585 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -9794,7 +9794,7 @@
         "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9844,7 +9844,7 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9894,7 +9894,7 @@
         "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -9944,7 +9944,7 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15797,7 +15797,7 @@
         "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15847,7 +15847,7 @@
         "Build-Win-MSVC-x86-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15897,7 +15897,7 @@
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15947,7 +15947,7 @@
         "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -15997,7 +15997,7 @@
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -16047,7 +16047,7 @@
         "Build-Win-MSVC-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"