dumping everything for SOLR refactor[#84689140]