diff --git a/src/Mod/Draft/draftmake/make_clone.py b/src/Mod/Draft/draftmake/make_clone.py
index 9a9831fe32..4114c5a6ee 100644
--- a/src/Mod/Draft/draftmake/make_clone.py
+++ b/src/Mod/Draft/draftmake/make_clone.py
@@ -126,11 +126,16 @@ def make_clone(obj, delta=None, forcedraft=False):
             cl.ViewObject.Proxy.resetColors(cl.ViewObject)
         # Workaround to trigger update of DiffuseColor:
         # Note: only works if obj contains 1 object.
-        ToDo.delay(lambda col: setattr(cl.ViewObject, "DiffuseColor", col),
-                   cl.ViewObject.DiffuseColor)
+        ToDo.delay(reapply_DiffuseColor, cl.ViewObject)
         gui_utils.select(cl)
     return cl
 
+def reapply_DiffuseColor(vobj):
+    try:
+        vobj.DiffuseColor = vobj.DiffuseColor
+    except:
+        pass
+
 
 clone = make_clone
 
diff --git a/src/Mod/Draft/drafttests/test_modification.py b/src/Mod/Draft/drafttests/test_modification.py
index 2c9ab0bb55..55c6682628 100644
--- a/src/Mod/Draft/drafttests/test_modification.py
+++ b/src/Mod/Draft/drafttests/test_modification.py
@@ -568,27 +568,6 @@ class DraftModification(unittest.TestCase):
         _msg("  object: '{0}' ({1})".format(box.Shape.ShapeType, box.TypeId))
 
         obj = Draft.make_clone(box)
-
-        # Code below by Chris Hennes.
-        # https://forum.freecadweb.org/viewtopic.php?p=656362#p656362
-        # This code is required because of the DiffuseColor workaround which
-        # reapplies the DiffuseColor with a delay. Without the code below the
-        # active document may get deleted beforehand resulting in an error.
-        if App.GuiUp:
-            from PySide import QtCore
-            class DelayEnder:
-                def __init__(self):
-                    self.delay_is_done = False
-                def stop(self):
-                    self.delay_is_done = True
-            ender = DelayEnder()
-            timer = QtCore.QTimer()
-            timer.timeout.connect(ender.stop)
-            timer.setSingleShot(True)
-            timer.start(100) # 100ms timer guarantees the loop below runs at least that long
-            while not ender.delay_is_done:
-                QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents)
-
         _msg("  clone: '{0}' ({1})".format(obj.Proxy.Type, obj.TypeId))
         self.assertTrue(obj, "'{}' failed".format(operation))
         self.assertTrue(obj.hasExtension("Part::AttachExtension"),