diff --git a/core/includes/file.inc b/core/includes/file.inc
index 3472e24..f330bc9 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -10,22 +10,11 @@
 use Drupal\Component\PhpStorage\FileStorage;
 use Drupal\Component\Utility\Bytes;
 use Drupal\Component\Utility\String;
-use Drupal\Core\Site\Settings;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\Core\StreamWrapper\PrivateStream;
 
 /**
- * Default mode for new directories. See drupal_chmod().
- */
-const FILE_CHMOD_DIRECTORY = 0775;
-
-/**
- * Default mode for new files. See drupal_chmod().
- */
-const FILE_CHMOD_FILE = 0664;
-
-/**
  * @defgroup file File interface
  * @{
  * Common file handling functions.
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index d2c1312..8ee62cf 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -14,6 +14,7 @@
 use Drupal\Core\Installer\InstallerKernel;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Logger\LoggerChannelFactory;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StringTranslation\Translator\FileTranslation;
 use Drupal\Core\Extension\ExtensionDiscovery;
@@ -339,6 +340,10 @@ function install_begin_request($class_loader, &$install_state) {
     ->register('string_translation', 'Drupal\Core\StringTranslation\TranslationManager')
     ->addArgument(new Reference('language_manager'));
 
+  $container
+    ->register('file_system', 'Drupal\Core\File\FileSystem')
+    ->addArgument(Settings::getInstance())
+    ->addArgument((new LoggerChannelFactory())->get('file'));
   // Register the stream wrapper manager.
   $container
     ->register('stream_wrapper_manager', 'Drupal\Core\StreamWrapper\StreamWrapperManager')