diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index cafdaef121d1..084038336460 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1161,7 +1161,7 @@ impl Step for Rustfmt {
         // Prepare the image directory
         // We expect RLS to build, because we've exited this step above if tool
         // state for RLS isn't testing.
-        let rustfmt = builder.ensure(tool::Rls {
+        let rustfmt = builder.ensure(tool::Rustfmt {
             compiler: builder.compiler(stage, build.build),
             target
         }).expect("Rustfmt to build: toolstate is testing");
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 0abc0441c266..524ba7908bd3 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -280,10 +280,6 @@ impl Builder {
         if rls_present {
             manifest.renames.insert("rls".to_owned(), Rename { to: "rls-preview".to_owned() });
         }
-        if rustfmt_present {
-            manifest.renames.insert("rustfmt".to_owned(),
-                                    Rename { to: "rustfmt-preview".to_owned() });
-        }
 
         let mut pkg = Package {
             version: self.cached_version("rust")