SOLR-4221 refactored