diff --git a/sendgrid/helpers/mail/email.py b/sendgrid/helpers/mail/email.py
index ba3a9884..aeab26af 100644
--- a/sendgrid/helpers/mail/email.py
+++ b/sendgrid/helpers/mail/email.py
@@ -3,20 +3,6 @@
 except ImportError:
     import email.utils as rfc822
 
-import sys
-if sys.version_info[:3] >= (3, 5, 0):
-    import html
-    html_entity_decode = html.unescape
-else:
-    try:
-        # Python 2.6-2.7
-        from HTMLParser import HTMLParser
-    except ImportError:
-        # Python < 3.5
-        from html.parser import HTMLParser
-    __html_parser__ = HTMLParser()
-    html_entity_decode = __html_parser__.unescape
-
 try:
     basestring = basestring
 except NameError:
@@ -91,11 +77,6 @@ def name(self, value):
         if not (value is None or isinstance(value, basestring)):
             raise TypeError('name must be of type string.')
 
-        # Escape common CSV delimiters as workaround for
-        # https://github.com/sendgrid/sendgrid-python/issues/578
-        if value is not None and (',' in value or ';' in value):
-            value = html_entity_decode(value)
-            value = '"' + value + '"'
         self._name = value
 
     @property
diff --git a/test/test_email.py b/test/test_email.py
index eb50374a..9db06070 100644
--- a/test/test_email.py
+++ b/test/test_email.py
@@ -66,17 +66,3 @@ def test_empty_obj_add_email(self):
         email.email = address
 
         self.assertEqual(email.email, address)
-
-    def test_add_name_with_comma(self):
-        email = Email()
-        name = "Name, Some"
-        email.name = name
-
-        self.assertEqual(email.name, '"' + name + '"')
-
-    def test_add_unicode_name_with_comma(self):
-        email = Email()
-        name = u"Name, Some"
-        email.name = name
-
-        self.assertEqual(email.name, u'"' + name + u'"')