--- service.inc
+++ service.inc
@@ -234,8 +234,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       if (!class_exists('Apache_Solr_Service')) {
         throw new Exception(t('SolrPhpClient library not found! Please follow the instructions in search_api_solr/INSTALL.txt for install
       }
-      $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-      $this->solr = new $class($this->options);
+      $this->solr = new SearchApiSolrConnection($this->options);
     }
   }
 
@@ -846,8 +845,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       }
       else {
         $key = trim($key);
-        $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-        $key = $class::phrase($key);
+        $key = SearchApiSolrConnection::phrase($key);
         $k[] = $key;
       }
     }
@@ -925,8 +923,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
    * and operator.
    */
   protected function createFilterQuery($field, $value, $operator, $field_info) {
-    $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-    $field = $class::escapeFieldName($field);
+    $field = SearchApiSolrConnection::escapeFieldName($field);
     if ($value === NULL) {
       return ($operator == '=' ? '-' : '') . "$field:[* TO *]";
     }
@@ -965,8 +962,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
         $value = format_date($value, 'custom', self::SOLR_DATE_FORMAT, 'UTC');
         break;
     }
-    $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-    return $class::phrase($value);
+    return SearchApiSolrConnection::phrase($value);
   }
 
   /**
@@ -991,8 +987,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       // Check for the "or" operator.
       if (isset($info['operator']) && $info['operator'] === 'or') {
         // Remember that filters for this field should be tagged.
-        $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-        $escaped = $class::escapeFieldName($fields[$info['field']]);
+        $escaped = SearchApiSolrConnection::escapeFieldName($fields[$info['field']]);
         $taggedFields[$escaped] = "{!tag=$escaped}";
         // Add the facet field.
         $facet_params['facet.field'][] = "{!ex=$escaped}$field";
@@ -1059,8 +1054,7 @@ class SearchApiSolrService extends SearchApiAbstractService {
       $k = $keys;
       $fields = $params['qf'];
       unset($params['qf']);
-      $class = variable_get('search_api_solr_service_class', 'SearchApiSolrConnection');
-      $keys = implode(":($k) OR ", array_map(array($class, 'escapeFieldName'), $fields)) . ":($k)";
+      $keys = implode(":($k) OR ", array_map(array('SearchApiSolrConnection', 'escapeFieldName'), $fields)) . ":($k)";
       return TRUE;
     }
     return FALSE;