diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 1becd81d2..813f4bf46 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -30,19 +30,15 @@
                  (and (featurep! :editor fold)
                       (save-excursion (end-of-line) (invisible-p (point))))
                  '+fold/toggle
-                 (fboundp 'evilmi-jump-items)
-                 'evilmi-jump-items)
+                 (fboundp 'evil-jump-item)
+                 'evil-jump-item)
       :v [tab] (general-predicate-dispatch nil
                  (and (bound-and-true-p yas-minor-mode)
                       (or (eq evil-visual-selection 'line)
-                          (and (fboundp 'evilmi-jump-items)
-                               (save-excursion
-                                 (/= (point)
-                                     (progn (evilmi-jump-items nil)
-                                            (point)))))))
+                          (not (memq (char-after) (list ?\( ?\[ ?\{ ?\} ?\] ?\))))))
                  'yas-insert-snippet
-                 (fboundp 'evilmi-jump-items)
-                 'evilmi-jump-items)
+                 (fboundp 'evil-jump-item)
+                 'evil-jump-item)
 
       ;; Smarter newlines
       :i [remap newline] #'newline-and-indent  ; auto-indent on newline
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 1fed18bc3..d3dc7658d 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -249,25 +249,6 @@ line with a linewise comment.")
   (add-hook 'doom-escape-hook #'+evil|escape-exchange))
 
 
-(def-package! evil-matchit
-  :commands (evilmi-jump-items global-evil-matchit-mode
-             evilmi-outer-text-object evilmi-inner-text-object)
-  :config (global-evil-matchit-mode 1)
-  :init
-  (global-set-key [remap evil-jump-item] #'evilmi-jump-items)
-  (define-key evil-inner-text-objects-map "%" #'evilmi-inner-text-object)
-  (define-key evil-outer-text-objects-map "%" #'evilmi-outer-text-object)
-  :config
-  ;; Fixes #519 where d% wouldn't leave a dangling end-parenthesis
-  (evil-set-command-properties 'evilmi-jump-items :type 'inclusive :jump t)
-
-  (defun +evil|simple-matchit ()
-    "A hook to force evil-matchit to favor simple bracket jumping. Helpful when
-the new algorithm is confusing, like in python or ruby."
-    (setq-local evilmi-always-simple-jump t))
-  (add-hook 'python-mode-hook #'+evil|simple-matchit))
-
-
 (def-package! evil-snipe
   :commands (evil-snipe-mode evil-snipe-override-mode
              evil-snipe-local-mode evil-snipe-override-local-mode)
diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el
index 29ed2f102..4c345d5e8 100644
--- a/modules/editor/evil/packages.el
+++ b/modules/editor/evil/packages.el
@@ -9,7 +9,6 @@
 (package! evil-escape)
 (package! evil-exchange)
 (package! evil-indent-plus)
-(package! evil-matchit)
 (package! evil-numbers :recipe (:fetcher github :repo "janpath/evil-numbers"))
 (package! evil-textobj-anyblock)
 (package! evil-snipe)
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index d94d4dc10..034ae11ba 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -116,14 +116,6 @@
 (def-package! rspec-mode
   :mode ("/\\.rspec\\'" . text-mode)
   :init
-  (defvar evilmi-ruby-match-tags
-    '((("unless" "if") ("elsif" "else") "end")
-      ("begin" ("rescue" "ensure") "end")
-      ("case" ("when" "else") "end")
-      (("class" "def" "while" "do" "module" "for" "until") () "end")
-      ;; Rake
-      (("task" "namespace") () "end")))
-
   (when (featurep! :editor evil)
     (add-hook 'rspec-mode-hook #'evil-normalize-keymaps))
   :config