Patch to work around lucene index mutate errors