diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc
--- b/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1485,7 +1485,6 @@
  *   The path to the installation directory.
  */
 function install_translations_directory() {
-  // @todo global $config, https://drupal.org/node/1881582
   if (isset($GLOBALS['conf']['locale.settings']['translation.path'])) {
     $directory = $GLOBALS['conf']['locale.settings']['translation.path'];
   }
diff -u b/core/includes/update.inc b/core/includes/update.inc
--- b/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -107,7 +107,6 @@
 
   // Enable UpdateServiceProvider service overrides.
   // @see update_flush_all_caches()
-  // @todo global $config, https://drupal.org/node/1881582
   $GLOBALS['conf']['container_service_providers']['UpdateServiceProvider'] = 'Drupal\Core\DependencyInjection\UpdateServiceProvider';
   $GLOBALS['conf']['update_service_provider_overrides'] = TRUE;
 
reverted:
--- b/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ a/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -159,7 +159,6 @@
             $this->cache[$cache_key]->setModuleOverride($module_overrides[$name]);
           }
           // Apply any settings.php overrides.
-          // @todo global $config, https://drupal.org/node/1881582
           if (isset($conf[$name])) {
             $this->cache[$cache_key]->setSettingsOverride($conf[$name]);
           }
@@ -235,7 +234,6 @@
           if (isset($module_overrides[$name])) {
             $this->cache[$cache_key]->setModuleOverride($module_overrides[$name]);
           }
-          // @todo global $config, https://drupal.org/node/1881582
           if (isset($conf[$name])) {
             $this->cache[$cache_key]->setSettingsOverride($conf[$name]);
           }
reverted:
--- b/core/lib/Drupal/Core/DrupalKernel.php
+++ a/core/lib/Drupal/Core/DrupalKernel.php
@@ -238,7 +238,6 @@
     }
 
     // Add site specific or test service providers.
-    // @todo Move to $settings? https://drupal.org/node/1881582
     if (!empty($GLOBALS['conf']['container_service_providers'])) {
       foreach ($GLOBALS['conf']['container_service_providers'] as $name => $class) {
         $serviceProviders[$name] = new $class();
@@ -246,7 +245,6 @@
       }
     }
     // Add site specific or test YAMLs.
-    // @todo Move to $settings? https://drupal.org/node/1881582
     if (!empty($GLOBALS['conf']['container_yamls'])) {
       $this->serviceYamls = array_merge($this->serviceYamls, $GLOBALS['conf']['container_yamls']);
     }
reverted:
--- b/core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php
+++ a/core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php
@@ -38,7 +38,6 @@
    * Tests configuration override.
    */
   function testConfOverride() {
-    // @todo global $config, https://drupal.org/node/1881582
     global $conf;
     $expected_original_data = array(
       'foo' => 'bar',
diff -u b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
--- b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -94,7 +94,6 @@
     // Build a minimal, partially mocked environment for unit tests.
     $this->containerBuild(\Drupal::getContainer());
     // Make sure it survives kernel rebuilds.
-    // @todo Move into $settings? https://drupal.org/node/1881582
     $GLOBALS['conf']['container_service_providers']['TestServiceProvider'] = 'Drupal\simpletest\TestServiceProvider';
 
     \Drupal::state()->set('system.module.files', $this->moduleFiles);
reverted:
--- b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php
+++ a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php
@@ -27,7 +27,6 @@
     parent::setUp();
     // The database is not available during this part of install. Use global
     // $conf to override the installation translations directory path.
-    // @todo global $config, https://drupal.org/node/1881582
     global $conf;
     $conf['locale.settings']['translation.path'] =  drupal_get_path('module', 'simpletest') . '/files/translations';
   }
diff -u b/core/modules/system/system.install b/core/modules/system/system.install
--- b/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -320,7 +320,6 @@
   // During an install we need to make assumptions about the file system
   // unless overrides are provided in settings.php.
   if ($phase == 'install') {
-    // @todo global $config, https://drupal.org/node/1881582
     global $conf;
     $directories = array();
     if ($file_public_path = settings()->get('file_public_path')) {
@@ -332,7 +331,6 @@
       // conf_path() cache must also be reset in this case.
       $directories[] = conf_path(FALSE, TRUE) . '/files';
     }
-    // @todo Move into $settings for consistency.
     if (!empty($conf['system.file']['path.private'])) {
       $directories[] = $conf['system.file']['path.private'];
     }
reverted:
--- b/core/modules/toolbar/toolbar.module
+++ a/core/modules/toolbar/toolbar.module
@@ -113,7 +113,6 @@
  *   once Drupal's page caching itself is properly integrated.
  */
 function _toolbar_initialize_page_cache() {
-  // @todo global $config, https://drupal.org/node/1881582
   $GLOBALS['conf']['system.performance']['cache']['page']['enabled'] = TRUE;
   drupal_page_is_cacheable(TRUE);
 
diff -u b/core/update.php b/core/update.php
--- b/core/update.php
+++ b/core/update.php
@@ -86,7 +86,6 @@
  * while updates are running.
  */
 function update_flush_all_caches() {
-  // @todo global $config, https://drupal.org/node/1881582
   $GLOBALS['conf']['update_service_provider_overrides'] = FALSE;
   \Drupal::service('kernel')->updateModules(\Drupal::moduleHandler()->getModuleList());