diff --git a/core/core-os.el b/core/core-os.el
index 28206edb7..426b1cf40 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -36,15 +36,11 @@
               ;; environment, so envvars will be wrong. That includes the PATH
               ;; Emacs picks up. `exec-path-from-shell' fixes this. This is slow
               ;; and benefits greatly from compilation.
-              (setq exec-path
-                    (or (eval-when-compile
-                          (when (require 'exec-path-from-shell nil t)
-                            (setq exec-path-from-shell-check-startup-files nil
-                                  exec-path-from-shell-arguments (delete "-i" exec-path-from-shell-arguments))
-                            (nconc exec-path-from-shell-variables '("GOPATH" "GOROOT" "PYTHONPATH"))
-                            (exec-path-from-shell-initialize)
-                            exec-path))
-                        exec-path)))
+              (when (require 'exec-path-from-shell nil t)
+                (setq exec-path-from-shell-check-startup-files nil
+                      exec-path-from-shell-arguments (delete "-i" exec-path-from-shell-arguments))
+                (nconc exec-path-from-shell-variables '("GOPATH" "GOROOT" "PYTHONPATH"))
+                (exec-path-from-shell-initialize)))
              (t
               (when (require 'osx-clipboard nil t)
                 (osx-clipboard-mode +1)))))