diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php
index 010f68984..e1cbdbbda 100644
--- a/src/Composer/Command/SelfUpdateCommand.php
+++ b/src/Composer/Command/SelfUpdateCommand.php
@@ -214,6 +214,6 @@ EOT
     protected function getOldInstallationFiles($rollbackDir)
     {
         $fs = new Filesystem;
-        return $fs->realpathGlob($rollbackDir . '/*' . self::OLD_INSTALL_EXT) ?: array();
+        return $fs->realpathGlob($rollbackDir . '/*' . self::OLD_INSTALL_EXT);
     }
 }
diff --git a/src/Composer/Downloader/ArchiveDownloader.php b/src/Composer/Downloader/ArchiveDownloader.php
index a412dc830..1f37ec974 100644
--- a/src/Composer/Downloader/ArchiveDownloader.php
+++ b/src/Composer/Downloader/ArchiveDownloader.php
@@ -132,7 +132,7 @@ abstract class ArchiveDownloader extends FileDownloader
      */
     private function listFiles($dir)
     {
-        $files = array_merge($this->filesystem->realpathGlob($dir . '/.*') ?: array(), $this->filesystem->realpathGlob($dir . '/*') ?: array());
+        $files = array_merge($this->filesystem->realpathGlob($dir . '/.*'), $this->filesystem->realpathGlob($dir . '/*'));
 
         return array_values(array_filter($files, function ($el) {
             return basename($el) !== '.' && basename($el) !== '..';
diff --git a/src/Composer/Installer/LibraryInstaller.php b/src/Composer/Installer/LibraryInstaller.php
index 7fb0f394c..b847eac69 100644
--- a/src/Composer/Installer/LibraryInstaller.php
+++ b/src/Composer/Installer/LibraryInstaller.php
@@ -126,7 +126,7 @@ class LibraryInstaller implements InstallerInterface
         $downloadPath = $this->getPackageBasePath($package);
         if (strpos($package->getName(), '/')) {
             $packageVendorDir = dirname($downloadPath);
-            if (is_dir($packageVendorDir) && !$this->filesystem->realpathGlob($packageVendorDir.'/*')) {
+            if (is_dir($packageVendorDir) && $this->filesystem->isDirEmpty($packageVendorDir)) {
                 @rmdir($packageVendorDir);
             }
         }
diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php
index 3ef17452e..b45135423 100644
--- a/src/Composer/Util/Filesystem.php
+++ b/src/Composer/Util/Filesystem.php
@@ -52,9 +52,9 @@ class Filesystem
     {
         $matches = glob($pattern, $flags);
         if (!$matches) {
-            return false;
+            return array();
         }
-        var_dump($matches);
+
         return array_map('realpath', $matches);
     }