restoring some more of the acts_as_solr_hacks to fix a few issues