Index: Jenkins/Distribute
===================================================================
--- Jenkins/Distribute	(revision 47138eed60107bd42f1cab53904b0d4e5f3bd93b)
+++ Jenkins/Distribute	(revision e018546aafb0ce24c3e3db6ffb7518153d7f9494)
@@ -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()
 	}
-
 }
 
Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 47138eed60107bd42f1cab53904b0d4e5f3bd93b)
+++ Jenkinsfile	(revision e018546aafb0ce24c3e3db6ffb7518153d7f9494)
@@ -8,6 +8,6 @@
 
 // Globals
-BuildDir  = ""
-SrcDir    = ""
+BuildDir  = null
+SrcDir    = null
 Settings  = null
 Tools     = null