diff --git a/agaric/templates/content/comment.html.twig b/agaric/templates/content/comment.html.twig
index 3576cc4..e65431c 100644
--- a/agaric/templates/content/comment.html.twig
+++ b/agaric/templates/content/comment.html.twig
@@ -97,6 +97,11 @@
       <h3{{ title_attributes.addClass('title', 'is-5') }}>{{ comment.label }}</h3>
       {{ title_suffix }}
     {% endif %}
-    {{ content }}
+    {{ content|without('links') }}
+    {# Until we have FlatComments in D8 officially, we'll do this.  Gnuget did
+    the port: https://www.drupal.org/project/flatcomments/issues/2820578 #}
+    {% if user.hasPermission('administer comments') %}
+      {{ content.links }}
+    {% endif %}
   </div>
 </article>