diff --git a/config/install/search_api_attachments.admin_config.yml b/config/install/search_api_attachments.admin_config.yml
index 0f9781f..07ba765 100644
--- a/config/install/search_api_attachments.admin_config.yml
+++ b/config/install/search_api_attachments.admin_config.yml
@@ -4,7 +4,6 @@ preserve_cache: true
 
 solr_extractor_configuration:
   solr_server: ''
-  solr_tika_path: 'update/extract'
 
 pdftotext_extractor_configuration: []
 
diff --git a/config/schema/search_api_attachments.schema.yml b/config/schema/search_api_attachments.schema.yml
index 027bb2b..708f04d 100644
--- a/config/schema/search_api_attachments.schema.yml
+++ b/config/schema/search_api_attachments.schema.yml
@@ -24,9 +24,6 @@ search_api_attachments.admin_config:
         solr_server:
           type: string
           label: 'Solr server'
-        solr_tika_path:
-          type: string
-          label: 'Solr extractor handler (e.g. update/extract)'
     python_pdf2txt_extractor_configuration:
       type: mapping
       label: 'Python Pdf2txt extractor configuration'
diff --git a/src/Plugin/search_api_attachments/SolrExtractor.php b/src/Plugin/search_api_attachments/SolrExtractor.php
index 974548c..c7f571c 100644
--- a/src/Plugin/search_api_attachments/SolrExtractor.php
+++ b/src/Plugin/search_api_attachments/SolrExtractor.php
@@ -69,29 +69,9 @@ class SolrExtractor extends TextExtractorPluginBase {
     // Get the Solr backend.
     /** @var \Drupal\search_api_solr\Plugin\search_api\backend\SearchApiSolrBackend $backend */
     $backend = $server->getBackend();
-    // Initialise the Client.
-    $client = $backend->getSolrConnection();
-    // Create the Query.
-    $query = $client->createExtract();
-    // setExtractOnly is only available in solarium 3.3.0 and up.
-    $query->setExtractOnly(TRUE);
-    $query->setFile($filepath);
-
-    // Override the extract handler.
-    // @see \Solarium\QueryType\Extract\Query::setHandler().
-    if (isset($this->configuration['solr_tika_path'])) {
-      $query->setHandler($this->configuration['solr_tika_path']);
-    }
+    // Extract the content.
+    $xml_data = $backend->extractContentFromFile($filepath);
 
-    // Execute the query.
-    $result = $client->extract($query);
-    $response = $result->getResponse();
-    $json_data = $response->getBody();
-    $array_data = Json::decode($json_data);
-    // $array_data contains json array with two keys : [filename] that contains
-    // the extracted text we need and [filename]_metadata that contains some
-    // extra metadata.
-    $xml_data = $array_data[$filepath];
     // We need to get only what is in body tag.
     $xmlencoder = new XmlEncoder();
     $dom_data = $xmlencoder->decode($xml_data, 'xml');
@@ -134,16 +114,6 @@ class SolrExtractor extends TextExtractorPluginBase {
       '#required' => TRUE,
     ];
 
-    $form['solr_tika_path'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Tika path'),
-      '#description' => $this->t('Specify a custom Tika extractor handler for
-        the Solr server, e.g. update/extract, or extract/tika. When no value
-        provided, the default "update/extract" is used. When no value is
-        set, then the handler provided by Solarium is used.'),
-      '#default_value' => empty($this->configuration['solr_tika_path']) ? 'update/extract' : $this->configuration['solr_tika_path'],
-    ];
-
     return $form;
   }
 
@@ -162,7 +132,6 @@ class SolrExtractor extends TextExtractorPluginBase {
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
     $this->configuration['solr_server'] = $form_state->getValue(array('text_extractor_config', 'solr_server'));
-    $this->configuration['solr_tika_path'] = $form_state->getValue(array('text_extractor_config', 'solr_tika_path'));
     parent::submitConfigurationForm($form, $form_state);
   }