SOLR-2565: Revert the commit that caused the slowness in some tests until we have a reason and solution for this