diff -u b/core/modules/history/history.module b/core/modules/history/history.module
--- b/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -88,7 +88,7 @@
  *   \Drupal\history\HistoryRepositoryInterface::updateLastViewed() instead.
  * @see https://www.drupal.org/node/2197189
  */
-function history_write($nid, $account = NULL) {
+function history_write($nid, AccountInterface $account = NULL) {
 
   if (!isset($account)) {
     $account = \Drupal::currentUser();
reverted:
--- b/core/modules/history/history.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  history.repository:
-    class: Drupal\history\HistoryRepository
-    arguments: ['@database', '@datetime.time', '@entity.memory_cache', '@current_user']
-    tags:
-      - { name: backend_overridable }
reverted:
--- b/core/modules/history/src/HistoryRepository.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-namespace Drupal\history;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
-
-/**
- * Provides history repository service.
- */
-class HistoryRepository implements HistoryRepositoryInterface {
-
-  /**
-   * An array of history IDs keyed by entity type and entity id.
-   *
-   * @var array
-   */
-  protected $history = [];
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * The time service.
-   *
-   * @var \Drupal\Component\Datetime\TimeInterface
-   */
-  protected $time;
-
-  /**
-   * The memory cache.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $memoryCache;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * Constructs the history repository service.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The database connection.
-   * @param \Drupal\Component\Datetime\TimeInterface $time
-   *   The time service.
-   * @param \Drupal\Core\Cache\MemoryCache\MemoryCacheInterface $memory_cache
-   *   The memory cache.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   */
-  public function __construct(Connection $connection, TimeInterface $time, MemoryCacheInterface $memory_cache, AccountInterface $current_user) {
-    $this->connection = $connection;
-    $this->time = $time;
-    $this->memoryCache = $memory_cache;
-    $this->currentUser = $current_user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLastViewed($entity_type, array $entity_ids) {
-    $entities = [];
-    $entities_to_read = [];
-    $user_id = $this->currentUser->id();
-    foreach ($entity_ids as $entity_id) {
-      // Load from the cache.
-      $cached = $this->memoryCache->get(
-        $this->buildCacheId($user_id, $entity_type, $entity_id
-      ));
-      if ($cached) {
-        $entities[$entity_id] = $cached->data;
-      }
-      else {
-        $entities_to_read[$entity_id] = 0;
-      }
-    }
-
-    if (empty($entities_to_read)) {
-      return $entities;
-    }
-
-    $result = $this->connection->select('history', 'h')
-      ->fields('h', ['entity_id', 'timestamp'])
-      ->condition('uid', $user_id)
-      ->condition('entity_type', $entity_type)
-      ->condition('entity_id', array_keys($entities_to_read), 'IN')
-      ->execute();
-
-    foreach ($result as $row) {
-      $timestamp = (int) $row->timestamp;
-      $this->memoryCache->set(
-        $this->buildCacheId($user_id, $entity_type, $row->entity_id),
-        $timestamp,
-        Cache::PERMANENT,
-        $this->getCacheTags($user_id, $row->entity_id)
-      );
-      $entities_to_read[$row->entity_id] = $timestamp;
-    }
-
-    return $entities + $entities_to_read;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateLastViewed(EntityInterface $entity) {
-    if ($this->currentUser->isAuthenticated()) {
-      $user_id = $this->currentUser->id();
-      $time = $this->time->getRequestTime();
-      $entity_id = $entity->id();
-      $entity_type_id = $entity->getEntityTypeId();
-      $this->connection->merge('history')
-        ->keys([
-          'uid' => $user_id,
-          'entity_id' => $entity_id,
-          'entity_type' => $entity_type_id,
-        ])
-        ->fields(['timestamp' => $time])
-        ->execute();
-      // Update cached value.
-      $this->memoryCache->set(
-        $this->buildCacheId($user_id, $entity_type_id, $entity_id),
-        $time, Cache::PERMANENT,
-        $this->getCacheTags($user_id, $entity_id)
-      );
-    }
-    return $this;
-  }
-
-  /**
-   * Builds the cache ID for the history timestamp.
-   *
-   * @param int $uid
-   *   The User ID.
-   * @param string $entity_type
-   *   The entity type.
-   * @param int $entity_id
-   *   The entity ID.
-   *
-   * @return string
-   *   Cache ID that can be passed to the cache backend.
-   */
-  protected function buildCacheId($uid, $entity_type, $entity_id) {
-    return implode(':', ['history', $uid, $entity_type, $entity_id]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags($uid, $entity_id) {
-    return [
-      'history',
-      "history:user:{$uid}",
-      "history:entity:{$entity_id}",
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function purge() {
-    $this->connection->delete('history')
-      ->condition('timestamp', HISTORY_READ_LIMIT, '<')
-      ->execute();
-    // Clean static cache.
-    Cache::invalidateTags(['history']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteByUser(AccountInterface $account) {
-    $this->connection->delete('history')
-      ->condition('uid', $account->id())
-      ->execute();
-    // Clean static cache.
-    Cache::invalidateTags(["history:user:{$account->id()}"]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteByEntity(EntityInterface $entity) {
-    $this->connection->delete('history')
-      ->condition('entity_id', $entity->id())
-      ->condition('entity_type', $entity->getEntityTypeId())
-      ->execute();
-    // Clean static cache.
-    Cache::invalidateTags(["history:entity:{$entity->id()}"]);
-  }
-
-}
reverted:
--- b/core/modules/history/src/HistoryRepositoryInterface.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\history;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines an interface to store and retrieve a last view timestamp of entities.
- */
-interface HistoryRepositoryInterface {
-
-  /**
-   * Retrieves the timestamp for the current user's last view of the entities.
-   *
-   * @param string $entity_type
-   *   The entity type.
-   * @param array $entity_ids
-   *   The entity IDs.
-   *
-   * @return array
-   *   Array of timestamps keyed by entity ID. If a entity has been previously
-   *   viewed by the user, the timestamp in seconds of when the last view
-   *   occurred; otherwise, zero.
-   */
-  public function getLastViewed($entity_type, array $entity_ids);
-
-  /**
-   * Updates 'last viewed' timestamp of the entity for the user account.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity that history should be updated.
-   *
-   * @return self
-   */
-  public function updateLastViewed(EntityInterface $entity);
-
-  /**
-   * Gets an array of cache tags for the history timestamp.
-   *
-   * @param int $uid
-   *   The User ID.
-   * @param int $entity_id
-   *   The entity ID.
-   *
-   * @return string[]
-   *   An array of cache tags based on the current view.
-   */
-  public function getCacheTags($uid, $entity_id);
-
-  /**
-   * Purges outdated history.
-   */
-  public function purge();
-
-  /**
-   * Deletes the history for the given user account.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The user account to purge history.
-   */
-  public function deleteByUser(AccountInterface $account);
-
-  /**
-   * Deletes the history for the given entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity that history should be deleted.
-   */
-  public function deleteByEntity(EntityInterface $entity);
-
-}
reverted:
--- b/core/modules/history/tests/src/Functional/Update/HistoryUpdateTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\Tests\history\Functional\Update;
-
-use Drupal\FunctionalTests\Update\UpdatePathTestBase;
-
-/**
- * Tests update functions for the History module.
- *
- * @group Update
- * @group legacy
- */
-class HistoryUpdateTest extends UpdatePathTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['history'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setDatabaseDumpFiles() {
-    $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.8.0.bare.standard.php.gz',
-    ];
-  }
-
-  /**
-   * Tests changing nid to entity_id and adding an entity_type field to the history table.
-   *
-   * @see history_update_8801()
-   */
-  public function testUpdateHookN() {
-    $database = \Drupal::database();
-    $schema = $database->schema();
-
-    // Run updates.
-    $this->runUpdates();
-
-    // Ensure fields were added.
-    $this->assertTrue($schema->fieldExists('history', 'entity_type'));
-    $this->assertTrue($schema->fieldExists('history', 'entity_id'));
-    // Ensure field was removed.
-    $this->assertFalse($schema->fieldExists('history', 'nid'));
-
-    $this->assertTrue($schema->indexExists('history', 'history_entity'));
-    $this->assertFalse($schema->indexExists('history', 'nid'));
-
-    $entries = $database->select('history')
-      ->fields('history')
-      ->condition('entity_type', 'node', '!=')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertEquals(0, $entries);
-  }
-
-}