diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp
index b8f5989deb..66926c6fab 100644
--- a/src/App/PropertyGeo.cpp
+++ b/src/App/PropertyGeo.cpp
@@ -1300,16 +1300,7 @@ std::string PropertyComplexGeoData::getElementMapVersion(bool) const
     if (!data) {
         return std::string();
     }
-    auto owner = freecad_cast<DocumentObject*>(getContainer());
-    std::ostringstream ss;
-    if (owner && owner->getDocument() && data->hasElementMap() && data->getElementMapSize() && owner->getDocument()->getStringHasher() == data->Hasher) {
-        ss << "1.";
-    }
-    else {
-        ss << "0.";
-    }
-    ss << data->getElementMapVersion();
-    return ss.str();
+    return data->getElementMapVersion();
 }
 
 bool PropertyComplexGeoData::checkElementMapVersion(const char* ver) const
@@ -1318,18 +1309,6 @@ bool PropertyComplexGeoData::checkElementMapVersion(const char* ver) const
     if (!data) {
         return false;
     }
-    auto owner = freecad_cast<DocumentObject*>(getContainer());
-    std::ostringstream ss;
-    const char* prefix;
-    if (owner && owner->getDocument() && owner->getDocument()->getStringHasher() == data->Hasher) {
-        prefix = "1.";
-    }
-    else {
-        prefix = "0.";
-    }
-    if (!boost::starts_with(ver, prefix)) {
-        return true;
-    }
     return data->checkElementMapVersion(ver + 2);
 }
 
diff --git a/src/Mod/CAM/Tools/Shape/ballend.fcstd b/src/Mod/CAM/Tools/Shape/ballend.fcstd
index d9bf4dc730..8f30f27e03 100644
Binary files a/src/Mod/CAM/Tools/Shape/ballend.fcstd and b/src/Mod/CAM/Tools/Shape/ballend.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/bullnose.fcstd b/src/Mod/CAM/Tools/Shape/bullnose.fcstd
index c2a7053993..4a3bf00e92 100644
Binary files a/src/Mod/CAM/Tools/Shape/bullnose.fcstd and b/src/Mod/CAM/Tools/Shape/bullnose.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/chamfer.fcstd b/src/Mod/CAM/Tools/Shape/chamfer.fcstd
index 2c8ef596a5..1510b43a79 100644
Binary files a/src/Mod/CAM/Tools/Shape/chamfer.fcstd and b/src/Mod/CAM/Tools/Shape/chamfer.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/dovetail.fcstd b/src/Mod/CAM/Tools/Shape/dovetail.fcstd
index 548726c2c3..aaedbc519d 100644
Binary files a/src/Mod/CAM/Tools/Shape/dovetail.fcstd and b/src/Mod/CAM/Tools/Shape/dovetail.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/drill.fcstd b/src/Mod/CAM/Tools/Shape/drill.fcstd
index 5d8ef15dea..e86b609f5a 100644
Binary files a/src/Mod/CAM/Tools/Shape/drill.fcstd and b/src/Mod/CAM/Tools/Shape/drill.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/endmill.fcstd b/src/Mod/CAM/Tools/Shape/endmill.fcstd
index 998a635ac2..dd7c7743a8 100644
Binary files a/src/Mod/CAM/Tools/Shape/endmill.fcstd and b/src/Mod/CAM/Tools/Shape/endmill.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/probe.fcstd b/src/Mod/CAM/Tools/Shape/probe.fcstd
index 8bcaf27888..2b6956bb6b 100644
Binary files a/src/Mod/CAM/Tools/Shape/probe.fcstd and b/src/Mod/CAM/Tools/Shape/probe.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/radius.fcstd b/src/Mod/CAM/Tools/Shape/radius.fcstd
index b5276922fd..671e4a80a4 100644
Binary files a/src/Mod/CAM/Tools/Shape/radius.fcstd and b/src/Mod/CAM/Tools/Shape/radius.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/reamer.fcstd b/src/Mod/CAM/Tools/Shape/reamer.fcstd
index 56ed8f1cee..a4055e1816 100644
Binary files a/src/Mod/CAM/Tools/Shape/reamer.fcstd and b/src/Mod/CAM/Tools/Shape/reamer.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/slittingsaw.fcstd b/src/Mod/CAM/Tools/Shape/slittingsaw.fcstd
index 2b33b0136c..bedb7e656c 100644
Binary files a/src/Mod/CAM/Tools/Shape/slittingsaw.fcstd and b/src/Mod/CAM/Tools/Shape/slittingsaw.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/tap.fcstd b/src/Mod/CAM/Tools/Shape/tap.fcstd
index a8febea77b..d9024e2dab 100644
Binary files a/src/Mod/CAM/Tools/Shape/tap.fcstd and b/src/Mod/CAM/Tools/Shape/tap.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/thread-mill.fcstd b/src/Mod/CAM/Tools/Shape/thread-mill.fcstd
index 575076c4f2..28c90ff47c 100644
Binary files a/src/Mod/CAM/Tools/Shape/thread-mill.fcstd and b/src/Mod/CAM/Tools/Shape/thread-mill.fcstd differ
diff --git a/src/Mod/CAM/Tools/Shape/v-bit.fcstd b/src/Mod/CAM/Tools/Shape/v-bit.fcstd
index 4d9e9fb280..412201e1af 100644
Binary files a/src/Mod/CAM/Tools/Shape/v-bit.fcstd and b/src/Mod/CAM/Tools/Shape/v-bit.fcstd differ