Go back to using rbenv init. Stop using Bundler binstubs. Set up Bundler aliases.
Go back to stop, more informative Git log messages