diff --git a/ci_environment/rvm/recipes/multi.rb b/ci_environment/rvm/recipes/multi.rb
index 547e4227a..c46dbf77f 100644
--- a/ci_environment/rvm/recipes/multi.rb
+++ b/ci_environment/rvm/recipes/multi.rb
@@ -50,7 +50,7 @@
 # make sure default Ruby is installed first
 bash "installing #{default_ruby}" do
   setup.call(self)
-  code   "#{rvm} install #{default_ruby} && #{rvm} use --default #{default_ruby}"
+  code   "rm -rf $HOME/.rvm/gemsets/global.gems && rm -rf $HOME/.rvm/gemsets/default.gems && #{rvm} install #{default_ruby} && #{rvm} use --default #{default_ruby}"
   not_if "#{rvm} #{default_ruby} do echo 'Found'"
 end
 
@@ -99,5 +99,5 @@
 
 bash "clean up RVM sources, log files, etc" do
   setup.call(self)
-  code "echo 'yes' | #{rvm} @global,default do gem uninstall rvm rubygems-bundler -a -I && #{rvm} cleanup all"
+  code "#{rvm} cleanup all"
 end
diff --git a/ci_environment/travis_build_environment/templates/default/vagrant/dot_bashrc.sh b/ci_environment/travis_build_environment/templates/default/vagrant/dot_bashrc.sh
index dbb835f0e..d733dbc65 100644
--- a/ci_environment/travis_build_environment/templates/default/vagrant/dot_bashrc.sh
+++ b/ci_environment/travis_build_environment/templates/default/vagrant/dot_bashrc.sh
@@ -116,5 +116,3 @@ export JAVA_HOME="/usr/lib/jvm/java-6-<%= node['java']['install_flavor'] %>"
 # has already been agreed on by Bundler and RVM maintainers), we need to
 # remove them to make sure bundler behavior does not change. MK.
 echo 'yes' | rvm @global,default do gem uninstall rvm rubygems-bundler -a -I
-# per discussion with mpapis. MK.
-rm -r ~/.rvm/gemsets/default*