LOGSTASH-926 1st attempt