diff --git a/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php b/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
index 02cc64b..1ea6cd9 100644
--- a/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
+++ b/src/Plugin/Plugin/PluginSelector/AdvancedPluginSelectorBase.php
@@ -12,8 +12,6 @@ use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\PageCache\ResponsePolicy\KillSwitch;
-use Drupal\Core\PageCache\ResponsePolicyInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
@@ -27,13 +25,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements ContainerFactoryPluginInterface {
 
   /**
-   * The response policy.
-   *
-   * @var \Drupal\Core\PageCache\ResponsePolicyInterface
-   */
-  protected $responsePolicy;
-
-  /**
    * Constructs a new class instance.
    *
    * @param array $configuration
@@ -41,9 +32,8 @@ abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements
    * @param array $plugin_definition
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, TranslationInterface $string_translation, ResponsePolicyInterface $response_policy) {
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, TranslationInterface $string_translation) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->responsePolicy = $response_policy;
     $this->stringTranslation = $string_translation;
   }
 
@@ -51,7 +41,7 @@ abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('string_translation'), $container->get('page_cache_kill_switch'));
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('string_translation'));
   }
 
   /**
@@ -60,12 +50,6 @@ abstract class AdvancedPluginSelectorBase extends PluginSelectorBase implements
   public function buildSelectorForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildSelectorForm($form, $form_state);
 
-    // Page caching breaks form rebuilds, so disable it.
-    $response_policy = $this->responsePolicy;
-    if ($response_policy instanceof KillSwitch) {
-      $response_policy->trigger();
-    }
-
     $available_plugins = [];
     $cacheability_metadata = CacheableMetadata::createFromRenderArray($form);
     foreach (array_keys($this->selectablePluginDiscovery->getDefinitions()) as $plugin_id) {
diff --git a/tests/src/Unit/Plugin/PluginSelector/PluginSelector/AdvancedPluginSelectorBaseTest.php b/tests/src/Unit/Plugin/PluginSelector/PluginSelector/AdvancedPluginSelectorBaseTest.php
index 5f928ae..a92307b 100644
--- a/tests/src/Unit/Plugin/PluginSelector/PluginSelector/AdvancedPluginSelectorBaseTest.php
+++ b/tests/src/Unit/Plugin/PluginSelector/PluginSelector/AdvancedPluginSelectorBaseTest.php
@@ -13,7 +13,6 @@ use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\PageCache\ResponsePolicy\KillSwitch;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\plugin\Plugin\Plugin\PluginSelector\AdvancedPluginSelectorBase;
 use Drupal\Tests\plugin\Unit\Plugin\PluginSelector\PluginSelector\PluginSelectorBaseTestBase;
@@ -41,22 +40,11 @@ class AdvancedPluginSelectorBaseTest extends PluginSelectorBaseTestBase {
   protected $stringTranslation;
 
   /**
-   * The response policy.
-   *
-   * @var \Drupal\Core\PageCache\ResponsePolicyInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $responsePolicy;
-
-  /**
    * {@inheritdoc}
    */
   public function setUp() {
     parent::setUp();
 
-    $this->responsePolicy = $this->getMockBuilder(KillSwitch::class)
-      ->disableOriginalConstructor()
-      ->getMock();
-
     $this->stringTranslation = $this->getStringTranslationStub();
 
     $this->sut = $this->getMockBuilder(AdvancedPluginSelectorBase::class)
@@ -64,8 +52,7 @@ class AdvancedPluginSelectorBaseTest extends PluginSelectorBaseTestBase {
         [],
         $this->pluginId,
         $this->pluginDefinition,
-        $this->stringTranslation,
-        $this->responsePolicy
+        $this->stringTranslation
       ))
       ->getMockForAbstractClass();
     $this->sut->setSelectablePluginType($this->selectablePluginType);
@@ -78,11 +65,6 @@ class AdvancedPluginSelectorBaseTest extends PluginSelectorBaseTestBase {
   function testCreate() {
     $container = $this->getMock(ContainerInterface::class);
     $map = array(
-      [
-        'page_cache_kill_switch',
-        ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE,
-        $this->responsePolicy
-      ],
       array(
         'string_translation',
         ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE,
@@ -605,8 +587,7 @@ class AdvancedPluginSelectorBaseTest extends PluginSelectorBaseTestBase {
         [],
         $this->pluginId,
         $this->pluginDefinition,
-        $this->stringTranslation,
-        $this->responsePolicy
+        $this->stringTranslation
       ))
       ->getMockForAbstractClass();
     $this->sut->setSelectablePluginType($this->selectablePluginType);