diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index f7ab2d7..d099d58 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -759,7 +759,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
     // Verify that we have an keyvalue service before using it. This is required
     // because this function is called during installation.
     // @todo Inject database connection into KeyValueStore\DatabaseStorage.
-    if (($container = drupal_container()) && $container->has('keyvalue') && function_exists('db_query')) {
+    if (($container = drupal_getContainer()) && $container->has('keyvalue') && function_exists('db_query')) {
       if ($type == 'module') {
         if (empty($files[$type])) {
           $files[$type] = Drupal::moduleHandler()->getModuleList();
@@ -2010,9 +2010,9 @@ function _drupal_bootstrap_configuration() {
  * Initialize the kernel / service container.
  */
 function _drupal_bootstrap_kernel() {
-  // Normally, index.php puts a container in drupal_container() by creating a
+  // Normally, index.php puts a container in the Drupal class by creating a
   // kernel. If there is no container yet, create one.
-  if (!drupal_container()) {
+  if (!drupal_getContainer()) {
     $kernel = new DrupalKernel('prod', drupal_classloader());
     $kernel->boot();
   }
@@ -2133,20 +2133,6 @@ function drupal_get_bootstrap_phase() {
 }
 
 /**
- * Retrieves the Drupal Container to standardize object construction.
- *
- * @deprecated This function has been replaced by the \Drupal class. Use that
- *   instead.
- *
- * @return Symfony\Component\DependencyInjection\ContainerInterface|bool
- *   The instance of the ContainerInterface used to set up and maintain
- *   object instances or FALSE if none exist yet.
- */
-function drupal_container() {
-  return Drupal::getContainer();
-}
-
-/**
  * Returns the list of enabled modules.
  *
  * @deprecated as of Drupal 8.0. Use