diff --git a/exec/hgmain/src/main.rs b/exec/hgmain/src/main.rs
index 61898dbc82..f300ed30e6 100644
--- a/exec/hgmain/src/main.rs
+++ b/exec/hgmain/src/main.rs
@@ -35,10 +35,12 @@ fn main() {
         }
     }
 
+    #[cfg(feature = "with_chg")]
+    maybe_call_chg();
+
     #[cfg(windows)]
     disable_standard_handle_inheritability().unwrap();
 
-    // FIXME: Restore the use of chg
     let mut io = clidispatch::io::IO::stdio();
     let code = hgcommands::run_command(full_args, &mut io);
     std::process::exit(code as i32);