Fix code that touches ES after bumping lucene to 3.6