diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
index 7e36d933..b0e7bdeb 100644
--- a/buildbot/master/files/config/environments.py
+++ b/buildbot/master/files/config/environments.py
@@ -43,23 +43,6 @@ def without(self, to_unset):
     'RUST_BACKTRACE': '1',
 })
 
-build_windows_gnu = build_common + Environment({
-    'CARGO_HOME': '/home/Administrator/.cargo',
-    'MSYS': 'winsymlinks=lnk',
-    'MSYSTEM': 'MINGW64',
-    'PATH': ';'.join([
-        r'C:\msys64\mingw64\bin',
-        r'C:\msys64\usr\bin',
-        r'C:\Windows\system32',
-        r'C:\Windows',
-        r'C:\Windows\System32\Wbem',
-        r'C:\Windows\System32\WindowsPowerShell\v1.0',
-        r'C:\Program Files\Amazon\cfn-bootstrap',
-        r'C:\Program Files (x86)\WiX Toolset v3.10\bin',
-    ]),
-    'SERVO_CACHE_DIR': '/home/Administrator/.servo',
-})
-
 build_windows_msvc = build_common + Environment({
     'CARGO_HOME': r'C:\Users\Administrator\.cargo',
     'PATH': ';'.join([
diff --git a/buildbot/master/files/config/factories.py b/buildbot/master/files/config/factories.py
index 630aa8de..ff77cc72 100644
--- a/buildbot/master/files/config/factories.py
+++ b/buildbot/master/files/config/factories.py
@@ -90,7 +90,6 @@ def setDefaultWorkdir(self, workdir):
     @defer.inlineCallbacks
     def run(self):
         self.is_windows = re.match('windows', self.builder_name)
-        self.is_win_gnu = re.match('windows-gnu', self.builder_name)
         try:
             show_cmd = "cat" if not self.is_windows else "type"
             native_yaml_path = self.yaml_path
@@ -177,9 +176,7 @@ def make_step(self, command):
 
         command = command.split(' ')
 
-        # Add `bash -l` before every command on Windows GNU builders
-        bash_args = ["bash", "-l"] if self.is_win_gnu else []
-        step_kwargs['command'] = bash_args + command
+        step_kwargs['command'] = command
         if self.is_windows:
             step_env += envs.Environment({
                 # Set home directory, to avoid adding `cd` command every time
diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg
index 9b288328..67603770 100644
--- a/buildbot/master/files/config/master.cfg
+++ b/buildbot/master/files/config/master.cfg
@@ -73,7 +73,6 @@ c['schedulers'].append(schedulers.AnyBranchScheduler(
         "mac-rel-css",
         "mac-rel-wpt1",
         "mac-rel-wpt2",
-        "windows-gnu-dev",
         "windows-msvc-dev",
     ],
     change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter),
@@ -102,9 +101,7 @@ c['schedulers'].append(schedulers.ForceScheduler(
         "mac-rel-intermittent",
         "mac-rel-wpt1",
         "mac-rel-wpt2",
-        "windows-gnu-dev",
         "windows-msvc-dev",
-        "windows-gnu-nightly",
         "windows-msvc-nightly",
     ],
 ))
@@ -117,7 +114,6 @@ c['schedulers'].append(schedulers.Nightly(
         "linux-rel-intermittent",
         "mac-nightly",
         "mac-rel-intermittent",
-        "windows-gnu-nightly",
         "windows-msvc-nightly",
     ],
     hour=1,
@@ -171,12 +167,8 @@ c['builders'] = [
     DynamicServoBuilder("mac-rel-intermittent", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-rel-wpt1", MAC_SLAVES, envs.build_mac),
     DynamicServoBuilder("mac-rel-wpt2", MAC_SLAVES, envs.build_mac),
-    DynamicServoBuilder("windows-gnu-dev", WINDOWS_SLAVES,
-                        envs.build_windows_gnu),
     DynamicServoBuilder("windows-msvc-dev", WINDOWS_SLAVES,
                         envs.build_windows_msvc),
-    DynamicServoBuilder("windows-gnu-nightly", WINDOWS_SLAVES,
-                        envs.build_windows_gnu),
     DynamicServoBuilder("windows-msvc-nightly", WINDOWS_SLAVES,
                         envs.build_windows_msvc),
     # The below builders are not dynamic but rather have hard-coded factories
diff --git a/homu/files/cfg.toml b/homu/files/cfg.toml
index 77b5542a..186c6a3c 100644
--- a/homu/files/cfg.toml
+++ b/homu/files/cfg.toml
@@ -245,8 +245,8 @@ secret = "{{ pillar["homu"]["gh-webhook-secret"] }}"
 [repo.servo.buildbot]
 url = "http://build.servo.org"
 secret = "{{ pillar["homu"]["buildbot-secret"] }}"
-builders = ["linux-dev", "linux-rel-css", "linux-rel-wpt", "mac-dev-unit", "mac-rel-wpt1", "mac-rel-wpt2", "mac-rel-css", "android", "arm32", "arm64", "windows-gnu-dev", "windows-msvc-dev"]
-try_builders = ["linux-dev", "linux-rel-css", "linux-rel-wpt", "mac-dev-unit", "mac-rel-wpt1", "mac-rel-wpt2", "mac-rel-css", "android", "arm32", "arm64", "windows-gnu-dev", "windows-msvc-dev"]
+builders = ["linux-dev", "linux-rel-css", "linux-rel-wpt", "mac-dev-unit", "mac-rel-wpt1", "mac-rel-wpt2", "mac-rel-css", "android", "arm32", "arm64", "windows-msvc-dev"]
+try_builders = ["linux-dev", "linux-rel-css", "linux-rel-wpt", "mac-dev-unit", "mac-rel-wpt1", "mac-rel-wpt2", "mac-rel-css", "android", "arm32", "arm64", "windows-msvc-dev"]
 username = "{{ pillar["homu"]["buildbot-http-user"] }}"
 password = "{{ pillar["homu"]["buildbot-http-pass"] }}"