This removes the 2-3s wait when using these two commands when the user has defined `org-directory` early.