Revert Lucene upgrade