diff --git a/shell/ruby.sh b/shell/ruby.sh
index a1a9b2f..280726d 100644
--- a/shell/ruby.sh
+++ b/shell/ruby.sh
@@ -35,13 +35,5 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias va="vagrant"
 fi
 
-# Load rbenv or RVM depending on which is available
-if [ -d "$HOME/.rbenv/bin" ]; then
-  # Don't load rbenv again if oh-my-zsh's rbenv plugin already has
-  if [[ ":$PATH:" != *":$HOME/.rbenv/bin:"* ]]; then
-    path_prepend "$HOME/.rbenv/bin"
-    eval "$(rbenv init -)"
-  fi
-elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
-  source "$HOME/.rvm/scripts/rvm"
-fi
+# Load rbenv
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
diff --git a/shell/zshrc.sh b/shell/zshrc.sh
index 5b30257..4c021ed 100644
--- a/shell/zshrc.sh
+++ b/shell/zshrc.sh
@@ -35,7 +35,7 @@ DISABLE_AUTO_TITLE="true"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(brew bundler cake cap gem heroku node nyan osx powder python rails3 \
-  rbenv ruby thor vagrant)
+  ruby thor vagrant)
 
 source "$ZSH/oh-my-zsh.sh"