diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Debug.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS32_Debug.json
rename to webrtc/build/ios/client.webrtc/iOS32_Debug.json
diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json b/webrtc/build/ios/client.webrtc/iOS32_Release.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS32_Release.json
rename to webrtc/build/ios/client.webrtc/iOS32_Release.json
diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS32_Simulator_Debug.json
rename to webrtc/build/ios/client.webrtc/iOS32_Simulator_Debug.json
diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Debug.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS64_Debug.json
rename to webrtc/build/ios/client.webrtc/iOS64_Debug.json
diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json b/webrtc/build/ios/client.webrtc/iOS64_Release.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS64_Release.json
rename to webrtc/build/ios/client.webrtc/iOS64_Release.json
diff --git a/webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json b/webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
similarity index 100%
rename from webrtc/build/ios/client.webrtc.fyi/iOS64_Simulator_Debug.json
rename to webrtc/build/ios/client.webrtc/iOS64_Simulator_Debug.json
diff --git a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
index 936b2416e7..aaa687efd3 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios32_sim_dbg.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "ia32",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "ia32"
   },
   "use_analyze": "false",
   "compiler": "ninja",
@@ -21,6 +19,6 @@
       "include": "common_tests.json",
       "device type": "iPhone 5s",
       "os": "9.0"
-    },
+    }
   ]
 }
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
index d5063291d2..900fe97b03 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_dbg.json
@@ -1,6 +1,6 @@
 {
   "owners": [
-    "kjellander",
+    "kjellander"
   ],
   "comments": [
     "GN + Ninja builder."
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm64",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm64"
   },
   "gn_args": [
     "ios_enable_code_signing=false",
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
index fb38f8c3fd..0fb8c718eb 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_gn_rel.json
@@ -1,6 +1,6 @@
 {
   "owners": [
-    "kjellander",
+    "kjellander"
   ],
   "comments": [
     "GN + Ninja builder."
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm64",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm64"
   },
   "gn_args": [
     "ios_enable_code_signing=false",
diff --git a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
index 26674dad43..065abd095a 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios64_sim_dbg.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "x64",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "x64"
   },
   "use_analyze": "false",
   "compiler": "ninja",
@@ -21,6 +19,6 @@
       "include": "common_tests.json",
       "device type": "iPhone 5s",
       "os": "9.0"
-    },
+    }
   ]
 }
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
index 6259b676ab..797e75e61a 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_dbg.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm64",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm64"
   },
   "use_analyze": "false",
   "compiler": "ninja",
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
index ae79ec4c43..6a886f23e6 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_arm64_rel.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm64",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm64"
   },
   "use_analyze": "false",
   "compiler": "ninja",
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
index bce02cad4e..549e60bc4b 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_dbg.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm"
   },
   "use_analyze": "false",
   "compiler": "ninja",
diff --git a/webrtc/build/ios/tryserver.webrtc/ios_rel.json b/webrtc/build/ios/tryserver.webrtc/ios_rel.json
index 339c4f0933..e183a29ced 100644
--- a/webrtc/build/ios/tryserver.webrtc/ios_rel.json
+++ b/webrtc/build/ios/tryserver.webrtc/ios_rel.json
@@ -8,9 +8,7 @@
   "xcode version": "7.0",
   "GYP_DEFINES": {
     "chromium_ios_signing": "0",
-    "target_arch": "arm",
-    "use_goma": "1",
-    "gomadir": "$(goma_dir)"
+    "target_arch": "arm"
   },
   "use_analyze": "false",
   "compiler": "ninja",