   ;; be to *pretend* that org-version.el is available, even though it
   ;; doesn't exist. Then `org-check-version' happily defines
   ;; `org-git-version' and `org-release' as autoloads pointing to
-  ;; org-version.el. Of course, then after Org is loaded, we have to
-  ;; override those autoloads to make the functions point back to what
-  ;; we want. Right now, the definition of `org-release' generated by
-  ;; `org-check-version' is the same as the one used above, so we
-  ;; don't bother to change it. That should change, FIXME.
+  ;; org-version.el (which is a no-op since we already defined the
+  ;; functions).
   (provide 'org-version)
-  (with-eval-after-load 'org
-    (defalias #'org-git-version #'radian--org-git-version))
 
   :config
 

  ;; generated and autoloaded. So in order to avoid the original
  ;; autoloads from being triggered under any circumstances, we have
  ;; to overwrite them here.
  (defalias #'org-git-version #'radian--org-git-version)
  (defun org-release () "N/A") ; FIXME: replace with a real function

  ;; Now, the culprit function is `org-check-version', which is
  ;; defined in org-compat.el and called from org.el. The problem with

  ;; based on the Git repo. (This is somewhat similar to what happens
  ;; in org-fixup.el.) We should really define a function that will
  ;; return the latest tag, as well, but this remains a FIXME for now.
  (defun radian-org-git-version ()
    "Return the abbreviated SHA for the Org Git repo."
    (let ((default-directory (concat user-emacs-directory
                                     "straight/repos/org/")))
