Back to elasticsearch.rb in upstream