diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderIndicator.php b/core/lib/Drupal/Core/Routing/RouteBuilderIndicator.php
deleted file mode 100644
index 5f06120..0000000
--- a/core/lib/Drupal/Core/Routing/RouteBuilderIndicator.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Routing\RouteBuilderIndicator.
- */
-
-namespace Drupal\Core\Routing;
-
-use Drupal\Core\State\StateInterface;
-use Symfony\Component\DependencyInjection\ContainerAware;
-
-/**
- * A simple service to be used instead of the route builder.
- *
- * The route builder service is required by quite a few other services,
- * however it has a lot of dependencies. Use this service to ensure that the
- * router is rebuilt.
- */
-class RouteBuilderIndicator implements RouteBuilderIndicatorInterface {
-
-  /**
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * @param \Drupal\Core\State\StateInterface $state
-   */
-  public function __construct(StateInterface $state) {
-    $this->state = $state;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setRebuildNeeded() {
-    $this->state->set(static::REBUILD_NEEDED, TRUE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isRebuildNeeded() {
-    return $this->state->get(static::REBUILD_NEEDED, FALSE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setRebuildDone() {
-    $this->state->set(static::REBUILD_NEEDED, FALSE);
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderIndicatorInterface.php b/core/lib/Drupal/Core/Routing/RouteBuilderIndicatorInterface.php
deleted file mode 100644
index 68ce5b8..0000000
--- a/core/lib/Drupal/Core/Routing/RouteBuilderIndicatorInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Routing\RouteBuilderIndicatorInterface.
- */
-
-namespace Drupal\Core\Routing;
-
-interface RouteBuilderIndicatorInterface {
-
-  /**
-   * The state key to use.
-   */
-  const REBUILD_NEEDED = 'router_rebuild_needed';
-
-  /**
-   * Sets the router to be rebuilt next time the kernel is terminated.
-   *
-   * @see \Drupal\Core\EventSubscriber\RouterRebuildSubscriber::onKernelTerminate()
-   * @see \Drupal\Core\Routing\RouteBuilderInterface::rebuildIfNeeded()
-   *
-   */
-  public function setRebuildNeeded();
-
-  /**
-   * Sets the router rebuild indicator to FALSE.
-   */
-  public function setRebuildDone();
-
-  /**
-   * Checks if the router needs to be rebuilt.
-   *
-   * @return bool
-   *   TRUE if the router needs to be rebuilt, FALSE if not.
-   */
-  public function isRebuildNeeded();
-
-}
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index 94a001a..b8f212f 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -247,6 +247,32 @@ public function testRebuildWithProviderBasedRoutes() {
 
     $this->assertTrue($this->routeBuilder->rebuild());
   }
+
+  /**
+   * Tests \Drupal\Core\Routing\RouteBuilder::rebuildIfNeeded() method.
+   */
+  public function testRebuildIfNeeded() {
+    $this->lock->expects($this->once())
+      ->method('acquire')
+      ->with('router_rebuild')
+      ->will($this->returnValue(TRUE));
+
+    $this->lock->expects($this->once())
+      ->method('release')
+      ->with('router_rebuild');
+
+    $this->yamlDiscovery->expects($this->any())
+                        ->method('findAll')
+                        ->will($this->returnValue(array()));
+
+    $this->routeBuilder->setRebuildNeeded();
+
+    // This will trigger a successful rebuild.
+    $this->assertTrue($this->routeBuilder->rebuildIfNeeded());
+
+    // This will not trigger a rebuild.
+    $this->assertFalse($this->routeBuilder->rebuildIfNeeded());
+  }
 }
 
 /**