Fix this in a simpler way
Fix this in a simpler way

Original commit: elastic/x-pack-elasticsearch@40bbb991d108b5fbd267ff1bff2ed21d262040e4

scorpionvicky/elasticsearch,coding0011/elasticsearch,robin13/elasticsearch,GlenRSmith/elasticsearch,nknize/elasticsearch,HonzaKral/elasticsearch,uschindler/elasticsearch,coding0011/elasticsearch,vroyer/elassandra,GlenRSmith/elasticsearch,gfyoung/elasticsearch,scorpionvicky/elasticsearch,robin13/elasticsearch,uschindler/elasticsearch,strapdata/elassandra,gingerwizard/elasticsearch,gfyoung/elasticsearch,uschindler/elasticsearch,scorpionvicky/elasticsearch,nknize/elasticsearch,gingerwizard/elasticsearch,uschindler/elasticsearch,gingerwizard/elasticsearch,GlenRSmith/elasticsearch,coding0011/elasticsearch,gingerwizard/elasticsearch,vroyer/elassandra,gingerwizard/elasticsearch,strapdata/elassandra,nknize/elasticsearch,gingerwizard/elasticsearch,gingerwizard/elasticsearch,robin13/elasticsearch,HonzaKral/elasticsearch,GlenRSmith/elasticsearch,scorpionvicky/elasticsearch,uschindler/elasticsearch,HonzaKral/elasticsearch,strapdata/elassandra,robin13/elasticsearch,gfyoung/elasticsearch,strapdata/elassandra,gfyoung/elasticsearch,gfyoung/elasticsearch,robin13/elasticsearch,coding0011/elasticsearch,GlenRSmith/elasticsearch,strapdata/elassandra,scorpionvicky/elasticsearch,HonzaKral/elasticsearch,vroyer/elassandra,coding0011/elasticsearch,nknize/elasticsearch,nknize/elasticsearch