diff --git a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
index c799601ce..baf01f427 100644
--- a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
+++ b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
@@ -94,8 +94,10 @@ public:
 		m_current_shape = (! is_first_layer && m_current_shape == SHAPE_NORMAL) ? SHAPE_REVERSED : SHAPE_NORMAL;
 		++ m_num_layer_changes;
 		// Extrusion rate for an extrusion aka perimeter width 0.35mm.
-		m_extrusion_flow = std::min(0.2f, layer_height) * 0.145f;
-		int layer_idx = int(std::floor(layer_height * 1000) + 0.5f);
+		// Clamp the extrusion height to a 0.2mm layer height, independent of the nozzle diameter.
+//		m_extrusion_flow = std::min(0.2f, layer_height) * 0.145f;
+		// Use a strictly
+		m_extrusion_flow = layer_height * 0.145f;
 	}
 
 	// Return the wipe tower position.
diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp
index 5190372f3..6ae36ec58 100644
--- a/xs/src/libslic3r/Print.cpp
+++ b/xs/src/libslic3r/Print.cpp
@@ -558,9 +558,11 @@ std::string Print::validate() const
     }
 
     if (this->has_wipe_tower() && ! this->objects.empty()) {
+        #if 0
         for (auto dmr : this->config.nozzle_diameter.values)
             if (std::abs(dmr - 0.4) > EPSILON)
                 return "The Wipe Tower is currently only supported for the 0.4mm nozzle diameter.";
+        #endif
         if (this->config.gcode_flavor != gcfRepRap)
             return "The Wipe Tower is currently only supported for the RepRap (Marlin / Sprinter) G-code flavor.";
         if (! this->config.use_relative_e_distances)