diff --git a/lib/completion.zsh b/lib/completion.zsh
index 3c5a41e14..21735e7e9 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,3 +60,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 805e92428..3970a497e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -18,8 +18,8 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
 # Load and run compinit
-autoload -U compinit
-compinit -i
+#autoload -U compinit
+#compinit -i
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]