Index: Jenkins/Distribute
===================================================================
--- Jenkins/Distribute	(revision 5e64df8ec87cca7ec40a987e3f8bc7e197a58935)
+++ Jenkins/Distribute	(revision 44856edf2e65daf51c0bc39fe8f674cd056b4fce)
@@ -2,7 +2,4 @@
 
 import groovy.transform.Field
-
-// For skipping stages
-import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -10,47 +7,45 @@
 //===========================================================================================================
 
+// Globals
+BuildDir  = null
+SrcDir    = null
+Settings  = null
+Version   = ''
+
+// Local variables
+def err = null
+def log_needed = false
+
+currentBuild.result = "SUCCESS"
+
+final commit, build
 node {
-	// Globals
-	BuildDir  = pwd tmp: true
-	SrcDir    = pwd tmp: false
-	Settings  = null
-	Version   = ''
-
-	// Local variables
-	def err = null
-	def log_needed = false
-
-	currentBuild.result = "SUCCESS"
 
 	//Wrap build to add timestamp to command line
 	wrap([$class: 'TimestamperBuildWrapper']) {
+		(commit, build) = prepare_build()
+	}
+}
 
-		final commit, build
-		(commit, build) = prepare_build()
-
-		node('x64') {
-			BuildDir  = pwd tmp: true
-			SrcDir    = pwd tmp: false
-
-			Tools.Clean()
-
-			Tools.Checkout( commit )
-
-			Version = GetVersion( build )
-
-			Configure()
-
-			Package()
-
-			Test()
-
-			Archive()
-		}
-
-		// Update the build directories when exiting the node
+node('x64') {
+	//Wrap build to add timestamp to command line
+	wrap([$class: 'TimestamperBuildWrapper']) {
 		BuildDir  = pwd tmp: true
 		SrcDir    = pwd tmp: false
+
+		Tools.Clean()
+
+		Tools.Checkout( commit )
+
+		Version = GetVersion( build )
+
+		Configure()
+
+		Package()
+
+		Test()
+
+		Archive()
 	}
-
 }