diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index c27a214847..48f04c23d6 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -68,13 +68,13 @@ use Alchemy\Phrasea\Core\Provider\SerializerServiceProvider;
 use Alchemy\Phrasea\Core\Provider\StatusServiceProvider;
 use Alchemy\Phrasea\Core\Provider\SubdefServiceProvider;
 use Alchemy\Phrasea\Core\Provider\TasksServiceProvider;
-use Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider;
 use Alchemy\Phrasea\Core\Provider\TokensServiceProvider;
 use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider;
 use Alchemy\Phrasea\Core\Provider\WebhookServiceProvider;
 use Alchemy\Phrasea\Core\Provider\ZippyServiceProvider;
 use Alchemy\Phrasea\Core\Provider\WebProfilerServiceProvider as PhraseaWebProfilerServiceProvider;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
+use Alchemy\Phrasea\Filesystem\FilesystemServiceProvider;
 use Alchemy\Phrasea\Form\Extension\HelpTypeExtension;
 use Alchemy\Phrasea\Media\DatafilesResolver;
 use Alchemy\Phrasea\Media\MediaAccessorResolver;
@@ -86,7 +86,6 @@ use MediaVorus\MediaVorus;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 use Neutron\ReCaptcha\ReCaptchaServiceProvider;
-use Neutron\Silex\Provider\FilesystemServiceProvider;
 use Silex\Application as SilexApplication;
 use Silex\Application\TranslationTrait;
 use Silex\Application\UrlGeneratorTrait;
@@ -161,7 +160,6 @@ class Application extends SilexApplication
         $this->register(new MonologServiceProvider());
         $this->setupMonolog();
         $this->register(new FilesystemServiceProvider());
-        $this->register(new TemporaryFilesystemServiceProvider());
         $this->register(new CacheServiceProvider());
         $this->register(new CacheConnectionServiceProvider());
         $this->register(new PhraseanetServiceProvider());
diff --git a/lib/Alchemy/Phrasea/Application/Helper/FilesystemAware.php b/lib/Alchemy/Phrasea/Application/Helper/FilesystemAware.php
index 0112b60cb2..213b356f31 100644
--- a/lib/Alchemy/Phrasea/Application/Helper/FilesystemAware.php
+++ b/lib/Alchemy/Phrasea/Application/Helper/FilesystemAware.php
@@ -10,7 +10,6 @@
 namespace Alchemy\Phrasea\Application\Helper;
 
 use Neutron\TemporaryFilesystem\Manager;
-use Neutron\TemporaryFilesystem\TemporaryFilesystemInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 trait FilesystemAware
diff --git a/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php b/lib/Alchemy/Phrasea/Filesystem/FilesystemServiceProvider.php
similarity index 75%
rename from lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php
rename to lib/Alchemy/Phrasea/Filesystem/FilesystemServiceProvider.php
index 1dacecf881..72cb5788ea 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Filesystem/FilesystemServiceProvider.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * This file is part of Phraseanet
  *
  * (c) 2005-2016 Alchemy
@@ -9,17 +8,22 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Phrasea\Filesystem;
 
-use Neutron\TemporaryFilesystem\TemporaryFilesystem;
 use Neutron\TemporaryFilesystem\Manager;
+use Neutron\TemporaryFilesystem\TemporaryFilesystem;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
+use Symfony\Component\Filesystem\Filesystem;
 
-class TemporaryFilesystemServiceProvider implements ServiceProviderInterface
+class FilesystemServiceProvider implements ServiceProviderInterface
 {
     public function register(Application $app)
     {
+        $app['filesystem'] = $app->share(function () {
+            new Filesystem();
+        });
+
         $app['temporary-filesystem.temporary-fs'] = $app->share(function (Application $app) {
             return new TemporaryFilesystem($app['filesystem']);
         });
@@ -30,5 +34,6 @@ class TemporaryFilesystemServiceProvider implements ServiceProviderInterface
 
     public function boot(Application $app)
     {
+        // no-op
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
deleted file mode 100644
index ea87a89b86..0000000000
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Alchemy\Tests\Phrasea\Core\Provider;
-
-/**
- * @group functional
- * @group legacy
- * @covers Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider
- */
-class TemporaryFilesystemServiceProviderTest extends ServiceProviderTestCase
-{
-    public function provideServiceDescription()
-    {
-        return [
-            ['Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider', 'temporary-filesystem', 'Neutron\TemporaryFilesystem\TemporaryFilesystemInterface'],
-        ];
-    }
-}