diff --git a/src/Base/BaseClassPy.xml b/src/Base/BaseClassPy.xml
index 6618168229..4d21220475 100644
--- a/src/Base/BaseClassPy.xml
+++ b/src/Base/BaseClassPy.xml
@@ -24,12 +24,6 @@
         <UserDocu>Returns all descentences</UserDocu>
       </Documentation>
     </Methode>
-    <Attribute Name="Type" ReadOnly="true">
-      <Documentation>
-        <UserDocu>Is the type of the FreeCAD object with module domain (deprecated use TypeId)</UserDocu>
-      </Documentation>
-      <Parameter Name="Type" Type="String" />
-    </Attribute>
     <Attribute Name="TypeId" ReadOnly="true">
       <Documentation>
         <UserDocu>Is the type of the FreeCAD object with module domain</UserDocu>
diff --git a/src/Base/BaseClassPyImp.cpp b/src/Base/BaseClassPyImp.cpp
index 879123c716..1ff47646cb 100644
--- a/src/Base/BaseClassPyImp.cpp
+++ b/src/Base/BaseClassPyImp.cpp
@@ -68,13 +68,6 @@ PyObject*  BaseClassPy::getAllDerivedFrom(PyObject *args)
     return Py::new_reference_to(res);
 }
 
-Py::String BaseClassPy::getType(void) const
-{
-    PyErr_SetString(PyExc_DeprecationWarning, "Use 'TypeId' instead");
-    PyErr_Print();
-    return Py::String(std::string(getBaseClassPtr()->getTypeId().getName()));
-}
-
 Py::String BaseClassPy::getTypeId(void) const
 {
     return Py::String(std::string(getBaseClassPtr()->getTypeId().getName()));
@@ -85,8 +78,15 @@ Py::Int BaseClassPy::getModule(void) const
     return Py::Int();
 }
 
-PyObject *BaseClassPy::getCustomAttributes(const char* /*attr*/) const
+PyObject *BaseClassPy::getCustomAttributes(const char* attr) const
 {
+    // this attribute is marked 'deprecated' but to keep old code working we
+    // handle it here. In a future version this will be removed.
+    if (strcmp(attr, "Type") == 0) {
+        PyErr_SetString(PyExc_DeprecationWarning, "Use 'TypeId' instead");
+        PyErr_Print();
+        return Py::new_reference_to(Py::String(std::string(getBaseClassPtr()->getTypeId().getName())));
+    }
     return 0;
 }