diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 210be5dfe410c..eb1cf07889c36 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Check the format
         # See tools/ci/src/main.rs for the commands this runs
-        run: cargo run --package ci
+        run: cargo run -p ci
         if: runner.os == 'linux' && matrix.toolchain == 'stable'
 
       - name: Build & run tests
diff --git a/rustfmt.toml b/rustfmt.toml
index dfdc0a8a42069..f9e4d8ed54098 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,5 +1,8 @@
-unstable_features = true
-imports_granularity = "Crate"
 use_field_init_shorthand = true
-reorder_impl_items = true
 newline_style = "Unix"
+
+# The following lines may be uncommented on nightly Rust.
+# Once these features have stabilized, they should be added to the always-enabled options above.
+#unstable_features = true
+#imports_granularity = "Crate"
+#reorder_impl_items = true