diff --git a/modules/os/tty/config.el b/modules/os/tty/config.el
index b3bd61be7..6fe259be2 100644
--- a/modules/os/tty/config.el
+++ b/modules/os/tty/config.el
@@ -35,11 +35,10 @@
       (and (require 'xclip nil t)
            (with-demoted-errors "%s" (xclip-mode +1))))))
 
-(when (featurep! :editor evil)
-  ;; Fix cursor shape-changing in the terminal. Only supported in XTerm, Gnome
-  ;; Terminal, iTerm, Konsole, dumb (etc. mintty), and Apple Terminal.app. If
-  ;; using Apple Terminal.app, install
-  ;; http://www.culater.net/software/SIMBL/SIMBL.php and
-  ;; https://github.com/saitoha/mouseterm-plus/releases. That makes to support
-  ;; VT's DECSCUSR sequence.
-  (add-hook 'tty-setup-hook #'evil-terminal-cursor-changer-activate))
+;; Fix cursor shape-changing in the terminal. Only supported in XTerm, Gnome
+;; Terminal, iTerm, Konsole, dumb (etc. mintty), and Apple Terminal.app. If
+;; using Apple Terminal.app, install
+;; http://www.culater.net/software/SIMBL/SIMBL.php and
+;; https://github.com/saitoha/mouseterm-plus/releases. That makes to support
+;; VT's DECSCUSR sequence.
+(add-hook 'tty-setup-hook #'evil-terminal-cursor-changer-activate)
diff --git a/modules/os/tty/packages.el b/modules/os/tty/packages.el
index 2b19346d1..6a13e4062 100644
--- a/modules/os/tty/packages.el
+++ b/modules/os/tty/packages.el
@@ -6,11 +6,8 @@
       :recipe (:host github :repo "spudlyo/clipetty")
       :pin "01b39044b9b65fa4ea7d3166f8b1ffab6f740362")
   ;; Despite its name, this works for macOS as well.
-  (package! xclip :pin "ef2ad92f3157d40b6d12c7e8485d633eaae7fc45"))
+  (package! xclip :pin "4772beb5579e13910c89c482a2e41271253c646b"))
 
-(when (featurep! :editor evil)
-  (package! evil-terminal-cursor-changer
-    ;; HACK Fix #3845: original package is abandoned. This fork fixes a breaking
-    ;;      bug that crashes the first terminal frame opened from the daemon.
-    :recipe (:host github :repo "kisaragi-hiu/evil-terminal-cursor-changer")
-    :pin "24755a18a311226933946f7218684dab5960ebc9"))
+;; NOTE Despite the evil-* prefix, evil-terminal-cursor-changer does not depend
+;;      on evil (anymore).
+(package! evil-terminal-cursor-changer :pin "12ea9c0438c67e560b3866dc78b5c7d1d93f8cc5")