diff --git a/lib/jekyll-remote-theme/munger.rb b/lib/jekyll-remote-theme/munger.rb
index 0b69c1c..63d2d1d 100644
--- a/lib/jekyll-remote-theme/munger.rb
+++ b/lib/jekyll-remote-theme/munger.rb
@@ -20,10 +20,10 @@ def munge!
         end
 
         Jekyll.logger.info LOG_KEY, "Using theme #{theme.name_with_owner}"
-        return theme if munged?
-
-        downloader.run
-        configure_theme
+        unless munged?
+          downloader.run
+          configure_theme
+        end
         enqueue_theme_cleanup
 
         theme
@@ -59,8 +59,6 @@ def configure_theme
 
       def enqueue_theme_cleanup
         at_exit do
-          return unless munged? && downloader.downloaded?
-
           Jekyll.logger.debug LOG_KEY, "Cleaning up #{theme.root}"
           FileUtils.rm_rf theme.root
         end