diff --git a/embargo.module b/embargo.module
index ced795b..1dfe943 100644
--- a/embargo.module
+++ b/embargo.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Database\Query\AlterableInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -14,6 +15,7 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\embargo\EmbargoInterface;
 use Drupal\embargo\EmbargoItemList;
 use Drupal\embargo\EmbargoStorage;
+use Drupal\islandora_hierarchical_access\LUTGeneratorInterface;
 
 /**
  * Implements hook_entity_type_alter().
@@ -134,3 +136,77 @@ function embargo_entity_base_field_info(EntityTypeInterface $entity_type) {
 
   return $fields;
 }
+
+/**
+ * Implements hook_ENTITY_TYPE_insert() for embargo entities.
+ */
+function embargo_embargo_insert(EntityInterface $entity) : void {
+  _embargo_search_api_track($entity);
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_update() for embargo entities.
+ */
+function embargo_embargo_update(EntityInterface $entity) : void {
+  _embargo_search_api_track($entity);
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_delete() for embargo entities.
+ */
+function embargo_embargo_delete(EntityInterface $entity) : void {
+  _embargo_search_api_track($entity);
+}
+
+/**
+ * Helper; deal with updating indexes of related items.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   The embargo instance.
+ */
+function _embargo_search_api_track(EntityInterface $entity) : void {
+  assert($entity instanceof EmbargoInterface);
+  if (!\Drupal::moduleHandler()->moduleExists('search_api')) {
+    return;
+  }
+
+  // On updates, deal with the original value, in addition to the new.
+  if (isset($entity->original)) {
+    _embargo_search_api_track($entity->original);
+  }
+
+  if (!($node = $entity->getEmbargoedNode())) {
+    // No embargoed node?
+    return;
+  }
+
+  /** @var \Drupal\search_api\Plugin\search_api\datasource\ContentEntityTrackingManager $tracking_manager */
+  $tracking_manager = \Drupal::getContainer()->get('search_api.entity_datasource.tracking_manager');
+  /** @var \Drupal\search_api\Utility\TrackingHelperInterface $tracking_helper */
+  $tracking_helper = \Drupal::getContainer()->get('search_api.tracking_helper');
+
+  $track = function (ContentEntityInterface $entity) use ($tracking_manager, $tracking_helper) {
+    $tracking_manager->trackEntityChange($entity);
+    $tracking_helper->trackReferencedEntityUpdate($entity);
+  };
+
+  $track($node);
+
+  $results = \Drupal::database()->select(LUTGeneratorInterface::TABLE_NAME, 'lut')
+    ->fields('lut', ['mid', 'fid'])
+    ->condition('nid', $node->id())
+    ->execute();
+  $media_ids = array_unique($results->fetchCol(0));
+  $file_ids = array_unique($results->fetchCol(1));
+
+  $entity_type_manager = \Drupal::entityTypeManager();
+  /** @var \Drupal\media\MediaInterface $media */
+  foreach ($entity_type_manager->getStorage('media')->loadMultiple($media_ids) as $media) {
+    $track($media);
+  }
+  /** @var \Drupal\file\FileInterface $file */
+  foreach ($entity_type_manager->getStorage('file')->loadMultiple($file_ids) as $file) {
+    $track($file);
+  }
+
+}
diff --git a/embargo.services.yml b/embargo.services.yml
index 23659b9..38b4738 100644
--- a/embargo.services.yml
+++ b/embargo.services.yml
@@ -31,7 +31,3 @@ services:
       - '@url_generator'
     tags:
       - { name: 'event_subscriber' }
-  embargo.tracking_event_subscriber:
-    class: Drupal\embargo\EventSubscriber\TrackingEventSubscriber
-    tags:
-      - { name: 'event_subscriber' }
diff --git a/src/EventSubscriber/TrackingEventSubscriber.php b/src/EventSubscriber/TrackingEventSubscriber.php
deleted file mode 100644
index 538c56f..0000000
--- a/src/EventSubscriber/TrackingEventSubscriber.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\embargo\EventSubscriber;
-
-use Drupal\search_api\Event\MappingForeignRelationshipsEvent;
-use Drupal\search_api\Event\SearchApiEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Inform search_api of entity_reference structures.
- */
-class TrackingEventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * {@inheritDoc}
-   */
-  public static function getSubscribedEvents() : array {
-    return [
-      SearchApiEvents::MAPPING_FOREIGN_RELATIONSHIPS => 'foreignRelationshipMap',
-    ];
-  }
-
-  /**
-   * Inform search_api of our computed entity_reference listings.
-   *
-   * @param \Drupal\search_api\Event\MappingForeignRelationshipsEvent $event
-   *   The event by which to inform.
-   */
-  public function foreignRelationshipMap(MappingForeignRelationshipsEvent $event) : void {
-    $mapping =& $event->getForeignRelationshipsMapping();
-    $index = $event->getIndex();
-    foreach ($index->getDatasources() as $id => $datasource) {
-      if (!in_array($datasource->getEntityTypeId(), ['file', 'media', 'node'])) {
-        continue;
-      }
-
-      $mapping[] = [
-        'datasource' => $id,
-        'entity_type' => 'embargo',
-        'property_path_to_foreign_entity' => 'embargo:entity:id',
-        'field_name' => 'id',
-      ];
-    }
-  }
-
-}