diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
deleted file mode 100644
index 629afa4cd..000000000
--- a/app/views/comments/_comment.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-%li.comment{:data=>{:guid=>comment.id}}
-  %a{:href => "/people/#{person.id}"}
-    %img{:src => image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id}
-  .content
-    .from
-      %a{:href => "/people/#{person.id}"}=person.real_name
-    = markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
-    %div.time
-      = comment.created_at ? "#{time_ago_in_words(comment.created_at)} #{t('ago')}" : time_ago_in_words(Time.now)
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index 5d567aa33..41b716ea6 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -4,7 +4,18 @@
 
 %ul.comments{:id => post_id, :class => ("hidden" if comment_hashes.size == 0)}
   - for comment_hash in comment_hashes
-    = render 'comments/comment', comment_hash
+    -comment = comment_hash[:comment]
+    -person = comment_hash[:person]
+
+    %li.comment{:data=>{:guid=>comment.id}}
+      %a{:href => "/people/#{person.id}"}
+        %img{:src => image_or_default(person), :class => "avatar", :alt => person.real_name, :title => person.real_name, "data-person_id" => person.id}
+      .content
+        .from
+          %a{:href => "/people/#{person.id}"}=person.real_name
+        = markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
+        %div.time
+          = comment.created_at ? "#{time_ago_in_words(comment.created_at)}" : Time.now
   %li.comment.show
     = render 'comments/new_comment', :post_id => post_id