Fix for LOGSTASH-2129