diff --git a/core/lib/Drupal/Core/File/FileSystem.php b/core/lib/Drupal/Core/File/FileSystem.php
index c5dc8d42a5..b26b56384c 100644
--- a/core/lib/Drupal/Core/File/FileSystem.php
+++ b/core/lib/Drupal/Core/File/FileSystem.php
@@ -54,8 +54,12 @@ class FileSystem implements FileSystemInterface {
    * @param \Psr\Log\LoggerInterface $logger
    *   The file logger channel.
    */
-  public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager, LoggerInterface $logger) {
+  public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager, $logger) {
     $this->streamWrapperManager = $stream_wrapper_manager;
+    $args = func_get_args();
+    if (!$args[1] instanceof LoggerInterface) {
+      $logger = $args[2];
+    }
     $this->logger = $logger;
   }