diff --git a/apps/document_comments/__init__.py b/apps/document_comments/__init__.py
index 53bc133a94..2356f36885 100644
--- a/apps/document_comments/__init__.py
+++ b/apps/document_comments/__init__.py
@@ -40,11 +40,6 @@ register_links(['comments_for_document', 'comment_add', 'comment_delete', 'comme
 register_links(Comment, [comment_delete])
 register_links(Document, [comments_for_document], menu_name='form_header')
 
-
-def flat_comments(document):
-    return u' '.join(document.comments.values_list('comment', flat=True))
-
-
 Document.add_to_class(
     'comments',
     generic.GenericRelation(
@@ -54,8 +49,6 @@ Document.add_to_class(
     )
 )
 
-Document.add_to_class('flat_comments', flat_comments)
-
 class_permissions(Document, [
     PERMISSION_COMMENT_CREATE,
     PERMISSION_COMMENT_DELETE,
diff --git a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
index 12ce19fa6f..77dfc80213 100644
--- a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
+++ b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
@@ -10,7 +10,10 @@
 {{ object.document_type }}
 {{ object.file_mimetype }}
 {{ object.description|default:' ' }}
-{{ object.flat_comments }}
+
+{% for comment in object.comments.all %}
+    {{ comment.comment }}
+{% endfor %}
 
 {% for tag in object.tags.all %}
     {{ tag }}