diff --git a/bin/dunepackaging.py b/bin/dunepackaging.py
index 774b1b5aae87d023dfb88d6f8a35eb7c455c1380..625f86a90e179cb6fd97b7fd32d8cac9e0a2db4f 100755
--- a/bin/dunepackaging.py
+++ b/bin/dunepackaging.py
@@ -57,11 +57,12 @@ def main(argv):
         print("Remove generated files: " + ", ".join(files))
         remove = ['rm', '-rf'] + files
         subprocess.call(remove)
+        # checkout setup.py and pyproject.toml
+        checkout = ['git', 'checkout', 'setup.py', 'pyproject.toml']
+        subprocess.call(checkout)
 
     if clean:
         removeFiles()
-        checkout = ['git', 'checkout', 'setup.py', 'pyproject.toml']
-        subprocess.call(checkout)
         sys.exit(2)
 
     data, cmake_flags = metaData(version, dependencyCheck=False)
@@ -69,15 +70,6 @@ def main(argv):
     if version is None:
         version = data.version
 
-    # Store current setup.py and pyproject.toml
-    if upload:
-        try:
-            subprocess.call(['cp', 'setup.py', 'setup.py.old'])
-            subprocess.call(['cp', 'pyproject.toml', 'pyproject.toml.old'])
-            print("Stored setup.py and pyproject.toml")
-        except:
-            pass
-
     # Generate setup.py
     print("Generate setup.py")
     f = open("setup.py", "w")
@@ -138,14 +130,6 @@ def main(argv):
 
         removeFiles()
 
-        # Restore old setup.py and pyproject.toml
-        try:
-            print("Restore setup.py and pyproject.toml")
-            subprocess.call(['mv', 'setup.py.old', 'setup.py'])
-            subprocess.call(['mv', 'pyproject.toml.old', 'pyproject.toml'])
-        except:
-            pass
-
 
 if __name__ == "__main__":
     main(sys.argv[1:])