Revert "Optimization for solr facets"

This reverts commit 59eca9605a61cfaee603c2f93b77dd7c3748ae50.