diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index ed22707..05268ed 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -361,7 +361,6 @@
 		"linux-arm-arm5spacemonkey",
 		"linux-amd64",
 		"linux-386-387",
-		"windows-amd64-2008",
 		"windows-386-gce",
 	} {
 		if c, ok := dashboard.Builders[name]; ok {
diff --git a/cmd/coordinator/gce.go b/cmd/coordinator/gce.go
index 5647e67..2558b9b 100644
--- a/cmd/coordinator/gce.go
+++ b/cmd/coordinator/gce.go
@@ -102,9 +102,11 @@
 		projectZone = path.Base(projectZone)
 		buildEnv.Zone = projectZone
 
-		buildEnv.StaticIP, err = metadata.ExternalIP()
-		if err != nil {
-			return fmt.Errorf("ExternalIP: %v", err)
+		if buildEnv.StaticIP == "" {
+			buildEnv.StaticIP, err = metadata.ExternalIP()
+			if err != nil {
+				return fmt.Errorf("ExternalIP: %v", err)
+			}
 		}
 
 		if !hasComputeScope() {