diff -u b/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
--- b/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -1024,7 +1024,7 @@
   protected function reInjectMe() {
     $this->eventDispatcher = \Drupal::service('event_dispatcher');
     $this->configManager = \Drupal::service('config.manager');
-    $this->lock = \Drupal::lock();
+    $this->lock = \Drupal::service('lock.persistent');
     $this->typedConfigManager = \Drupal::service('config.typed');
     $this->moduleHandler = \Drupal::moduleHandler();
     $this->themeHandler = \Drupal::service('theme_handler');
@@ -1042,7 +1042,7 @@
   protected function reInjectMe() {
     $this->eventDispatcher = \Drupal::service('event_dispatcher');
     $this->configManager = \Drupal::service('config.manager');
-    $this->lock = \Drupal::service('lock.persistent');
+    $this->lock = \Drupal::lock();
     $this->typedConfigManager = \Drupal::service('config.typed');
     $this->moduleHandler = \Drupal::moduleHandler();
     $this->themeHandler = \Drupal::service('theme_handler');
reverted:
--- b/core/lib/Drupal/Core/Lock/PersistentDatabaseLockBackend.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Lock\PersistentDatabaseLockBackend.
- */
-
-namespace Drupal\Core\Lock;
-
-use Drupal\Core\Database\Connection;
-
-/**
- * Defines the persistent database lock backend. This backend is global for this
- * Drupal installation.
- *
- * @ingroup lock
- */
-class PersistentDatabaseLockBackend extends DatabaseLockBackend {
-
-  /**
-   * Constructs a new PersistentDatabaseLockBackend.
-   *
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
-   */
-  public function __construct(Connection $database) {
-    // This simply overrides the parent constructor, to not have it register
-    // releaseAll() as a shutdown function.
-    $this->database = $database;
-    // Set the lockId to a fixed string to make the lock ID the same across
-    // multiple requests.
-    $this->lockId = 'persistent';
-  }
-}
only in patch2:
unchanged:
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
@@ -26,11 +26,12 @@ class FieldImportDeleteUninstallTest extends FieldUnitTestBase {
 
   protected function setUp() {
     parent::setUp();
-    // Module uninstall requires the router and users_data tables.
+    // Module uninstall requires the router, users_data, and semaphore tables.
     // @see drupal_flush_all_caches()
     // @see user_modules_uninstalled()
     $this->installSchema('system', array('router'));
     $this->installSchema('user', array('users_data'));
+    $this->installSchema('system', 'semaphore');
   }
 
   /**