Revert Solr changes from "Merged upstream and done necessary changes in custom templates."

This reverts part of commit 6c91b34a05cc52fde297e8f05b6ae2ea13894cea.