ported 2.3.5 repo to Bundler/Gemfile