diff --git a/modules/base/emacs/default.nix b/modules/base/emacs/default.nix
index a7f76bb2..f0e889a4 100644
--- a/modules/base/emacs/default.nix
+++ b/modules/base/emacs/default.nix
@@ -16,7 +16,7 @@
       readOnly = true;
       default = pkgs.emacsWithPackagesFromUsePackage {
         config = config.chvp.base.emacs.fullConfig;
-        package = pkgs.emacsNativeComp;
+        package = pkgs.emacsPgtkNativeComp;
         alwaysEnsure = true;
         # mu4e is included in the mu package and should be used from there
         extraEmacsPackages = epkgs: lib.optional config.chvp.graphical.mail.enable pkgs.mu;
diff --git a/modules/base/emacs/early-init.el b/modules/base/emacs/early-init.el
index 083379b5..a254ad62 100644
--- a/modules/base/emacs/early-init.el
+++ b/modules/base/emacs/early-init.el
@@ -22,17 +22,6 @@
 (add-hook 'emacs-startup-hook #'hm/restore-gc)
 (add-hook 'minibuffer-exit-hook #'hm/restore-gc)
 
-;; Avoid unnecessary regexp matching while loading .el files.
-(defvar hm/file-name-handler-alist file-name-handler-alist)
-(setq file-name-handler-alist nil)
-
-(defun hm/restore-file-name-handler-alist ()
-  "Restore the 'file-name-handler-alist' variable."
-  (setq file-name-handler-alist hm/file-name-handler-alist)
-  (makunbound 'hm/file-name-handler-alist))
-
-(add-hook 'emacs-startup-hook #'hm/restore-file-name-handler-alist)
-
 ;; Nix manages our packages
 (setq package-enable-at-startup nil)