diff --git a/files/templates/comments.html b/files/templates/comments.html
index 086f29dfd1..c3735e93bd 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -735,26 +735,12 @@
{% endif %}
-
-
-
-
-
-
-
-
-
-
-
{% endif %}
-
{% endmacro %}
-{% for comment in comments if comment.can_see(v) %}
-
+{% for comment in comments(g.db) if comment.can_see(v) %}
{{single_comment(comment)}}
-
{% endfor %}
{% if not request.headers.get("xhr") %}