Switch back to bundler ~> 1.6