diff --git a/lisa/utils.py b/lisa/utils.py
index c2e62e9503b6e71fd079c60579cd011fbc871d2c..8e41ae785cb384a1f11ef08a676c40a5c6c49c06 100644
--- a/lisa/utils.py
+++ b/lisa/utils.py
@@ -175,11 +175,6 @@ class Serializable(Loggable):
         # was deserialized
         yaml.Constructor.add_constructor(None, cls._yaml_unknown_tag_constructor)
 
-        #TODO: remove that once the issue is fixed
-        # Workaround for ruamel.yaml bug #244:
-        # https://bitbucket.org/ruamel/yaml/issues/244
-        yaml.Representer.add_multi_representer(type, yaml.Representer.represent_name)
-
     @classmethod
     def _yaml_unknown_tag_constructor(cls, loader, node):
         # Get the basic data types that can be expressed using the YAML syntax,
diff --git a/tools/exekall/exekall/engine.py b/tools/exekall/exekall/engine.py
index 29e5d5126945aacd70638f6296142fdbfc44da94..a1fadf03ab72e807ea79e9cd3e23c273baa2b321 100644
--- a/tools/exekall/exekall/engine.py
+++ b/tools/exekall/exekall/engine.py
@@ -87,12 +87,6 @@ class StorageDB:
         yaml.default_flow_style = False
         yaml.indent = 4
 
-        #TODO: remove that once the issue is fixed
-        # Workaround for ruamel.yaml bug #244:
-        # https://bitbucket.org/ruamel/yaml/issues/244
-        yaml.Representer.add_multi_representer(type, ruamel.yaml.representer.Representer.represent_name)
-
-
     def __init__(self, obj_store):
         self.obj_store = obj_store