LPS-35742 Rollback this change because is breaking all tests related to Lucene indexing