diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index d32e8b2..e86a36b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -159,14 +159,10 @@
 ;; Modeline format:
 (display-time-mode -1)
 
-;; 2025-07-09 I used to have this set to make emacs faster and not do vc
-;; stuff over tramp but that breaks remote eglot because it breaks remote
-;; project, so we can't do that.
-;;
-;; (setq vc-ignore-dir-regexp
-;;       (format "\\(%s\\)\\|\\(%s\\)"
-;;               vc-ignore-dir-regexp
-;;               tramp-file-name-regexp))
+(setq vc-ignore-dir-regexp
+      (format "\\(%s\\)\\|\\(%s\\)"
+              vc-ignore-dir-regexp
+              tramp-file-name-regexp))
 
 ;; ================================================================
 ;; Fonts and windows and the like, only if graphics.
@@ -1251,31 +1247,6 @@ Or, uh, Objective C, I guess."
   ;; Let tramp search $PATH as given to the $USER on the remote machine
   ;; (necessary to find 'hphpd' for instance)
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
-
-  ;; All of this configuration comes from this guide here:
-  ;; https://coredumped.dev/2025/06/18/making-tramp-go-brrrr./
-  (setq remote-file-name-inhibit-locks t
-        tramp-use-scp-direct-remote-copying t
-        remote-file-name-inhibit-auto-save-visited t
-        tramp-copy-size-limit (* 1024 1024) ;; 1MB
-        tramp-verbose 2)
-
-  (connection-local-set-profile-variables
-   'remote-direct-async-process
-   '((tramp-direct-async-process . nil))) ;; NOTE: t here breaks eglot :(
-
-  ;; (connection-local-get-profile-variables 'remote-direct-async-process)
-
-  (connection-local-set-profiles
-   '(:application tramp :machine "arca.ssh")
-   'remote-direct-async-process)
-
-  (setq magit-tramp-pipe-stty-settings 'pty)
-
-  (with-eval-after-load 'tramp
-    (with-eval-after-load 'compile
-      (remove-hook 'compilation-mode-hook #'tramp-compile-disable-ssh-controlmaster-options)))
-
   ;; Use putty on windows
   (when (eq window-system 'w32)
     (setq tramp-default-method "plink")))
@@ -1437,8 +1408,7 @@ Do this when you edit your project view."
 ;; =================================================================
 ;; Jsonnet
 ;; =================================================================
-(use-package jsonnet-mode :ensure t
-  :mode "\\.jsonnet\\(\\.TEMPLATE\\)?\\'")
+(use-package jsonnet-mode :ensure t)
 
 ;; =================================================================
 ;; Fish shell
diff --git a/site-lisp/doty-tools-buffer-map.el b/site-lisp/doty-tools-buffer-map.el
index 0575d96..4e17543 100644
--- a/site-lisp/doty-tools-buffer-map.el
+++ b/site-lisp/doty-tools-buffer-map.el
@@ -212,9 +212,7 @@ Example:
    :confirm nil
    :include t))
 
-(condition-case nil
-    (doty-tools-register-mappers)
-  (error nil))
+(doty-tools-register-mappers)
 
 (provide 'doty-tools-buffer-map)
 ;;; doty-tools-buffer-map.el ends here