Reduce the necessity for bundler 1.7