Re-applying Solr4 mandatory changes.