diff --git a/modules/facets_exposed_filters/facets_exposed_filters.services.yml b/modules/facets_exposed_filters/facets_exposed_filters.services.yml
deleted file mode 100644
index 9bf6de683f04f6dd2bad694154412e26c853d3ca..0000000000000000000000000000000000000000
--- a/modules/facets_exposed_filters/facets_exposed_filters.services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-  facets_exposed_filters.facets_exposed_filters_subscriber:
-    class: Drupal\facets_exposed_filters\EventSubscriber\FacetsExposedFiltersSubscriber
-    tags:
-      - { name: event_subscriber }
diff --git a/modules/facets_exposed_filters/src/EventSubscriber/FacetsExposedFiltersSubscriber.php b/modules/facets_exposed_filters/src/EventSubscriber/FacetsExposedFiltersSubscriber.php
deleted file mode 100644
index daa579405f5058437a3bed39ec5cb2da7d9b107b..0000000000000000000000000000000000000000
--- a/modules/facets_exposed_filters/src/EventSubscriber/FacetsExposedFiltersSubscriber.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\facets_exposed_filters\EventSubscriber;
-
-use Drupal\facets\FacetManager\DefaultFacetManager;
-use Drupal\search_api\Event\QueryPreExecuteEvent;
-use Drupal\search_api\Event\SearchApiEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Provides the FacetsExposedFiltersSubscriber class.
- *
- * @package Drupal\facets_exposed_filters\EventSubscriber
- */
-class FacetsExposedFiltersSubscriber implements EventSubscriberInterface {
-
-  /**
-   * Reacts to the query alter event.
-   *
-   * @param \Drupal\search_api\Event\QueryPreExecuteEvent $event
-   *   The query alter event.
-   */
-  public function queryAlter(QueryPreExecuteEvent $event) {
-    $query = $event->getQuery();
-
-    if ($query->getIndex()->getServerInstance()->supportsFeature('search_api_facets')) {
-      // Views adds an extra nested conditiongroup, we need to remove this for facets.
-      if($query->getOption('uses_facets_exposed_filters')) {
-        $conditions = &$query->getConditionGroup()->getConditions();
-        if(count($conditions) == 1 && $conditions[0] instanceof \Drupal\search_api\Query\ConditionGroupInterface) {
-          $conditions = $conditions[0]->getConditions();
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents(): array {
-    // Workaround to avoid a fatal error during site install from existing
-    // config.
-    // @see https://www.drupal.org/project/facets/issues/3199156
-    if (!class_exists('\Drupal\search_api\Event\SearchApiEvents', TRUE)) {
-      return [];
-    }
-
-    return [
-      SearchApiEvents::QUERY_PRE_EXECUTE => 'queryAlter',
-    ];
-  }
-
-}
diff --git a/modules/facets_exposed_filters/src/Plugin/views/filter/FacetsFilter.php b/modules/facets_exposed_filters/src/Plugin/views/filter/FacetsFilter.php
index 1040ae709dbb9e9a5539d198fe47ee8a0d05a127..ad52cfd737d3ef83b9347fbe4241b66291312a6b 100644
--- a/modules/facets_exposed_filters/src/Plugin/views/filter/FacetsFilter.php
+++ b/modules/facets_exposed_filters/src/Plugin/views/filter/FacetsFilter.php
@@ -236,9 +236,6 @@ class FacetsFilter extends FilterPluginBase {
    * {@inheritdoc}
    */
   public function query() {
-    // Tag query
-    $this->query->setOption('uses_facets_exposed_filters', TRUE);
-
     $facet = $this->getFacet();
     $active_values = $this->getActiveFacetValues();
     $facet->setActiveItems($active_values);