diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 3c47bf13b..92a39c61e 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -70,7 +70,6 @@ private
   def index_for_post
     @post = Post.find(params[:post_id])
     @comments = @post.comments
-    @comments = @comments.visible(CurrentUser.user) unless params[:include_below_threshold]
     render :action => "index_for_post"
   end
 
diff --git a/app/javascript/src/javascripts/comments.js b/app/javascript/src/javascripts/comments.js
index 82c137e85..2637b6f03 100644
--- a/app/javascript/src/javascripts/comments.js
+++ b/app/javascript/src/javascripts/comments.js
@@ -11,16 +11,8 @@ Comment.initialize_all = function() {
     this.initialize_expand_links();
   }
 
-  if ($("#c-posts").length && $("#a-show").length) {
-    Comment.highlight_threshold_comments(Utility.meta("post-id"));
-  }
-
-  $(window).on("danbooru:index_for_post", (_event, post_id, current_comment_section, include_below_threshold) => {
-    if (include_below_threshold) {
-      $("#threshold-comments-notice-for-" + post_id).hide();
-    } else {
-      Comment.highlight_threshold_comments(post_id);
-    }
+  $(window).on("danbooru:index_for_post", (_event, post_id, current_comment_section) => {
+    $("#threshold-comments-notice-for-" + post_id).hide();
     Dtext.initialize_expandables(current_comment_section);
   });
 }
@@ -67,17 +59,6 @@ Comment.show_edit_form = function(e) {
   e.preventDefault();
 }
 
-Comment.highlight_threshold_comments = function(post_id) {
-  var threshold = parseInt(Utility.meta("user-comment-threshold"));
-  var articles = $("article.comment[data-post-id=" + post_id + "]");
-  articles.each(function(i, v) {
-    var $comment = $(v);
-    if (parseInt($comment.data("score")) < threshold) {
-      $comment.addClass("below-threshold");
-    }
-  });
-}
-
 Comment.hide_threshold_comments = function(post_id) {
   var threshold = parseInt(Utility.meta("user-comment-threshold"));
   var articles = $("article.comment[data-post-id=" + post_id + "]");
diff --git a/app/models/comment.rb b/app/models/comment.rb
index a252d0233..0a7fcbfb6 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -189,6 +189,10 @@ class Comment < ApplicationRecord
     true
   end
 
+  def below_threshold?(user = CurrentUser.user)
+    score < user.comment_threshold
+  end
+
   def editable_by?(user)
     creator_id == user.id || user.is_moderator?
   end
diff --git a/app/views/comments/index_for_post.js.erb b/app/views/comments/index_for_post.js.erb
index a58fd7168..7cea35603 100644
--- a/app/views/comments/index_for_post.js.erb
+++ b/app/views/comments/index_for_post.js.erb
@@ -2,4 +2,4 @@ $("#hidden-comments-notice-for-<%= @post.id %>").hide();
 
 var current_comment_section = $("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments");
 current_comment_section.html("<%= j(render(:partial => 'comments/partials/show/comment', :collection => @comments))%>");
-$(window).trigger("danbooru:index_for_post", [<%= @post.id %>, current_comment_section, <%= ActiveModel::Type::Boolean.new.cast(params[:include_below_threshold]) %>]);
+$(window).trigger("danbooru:index_for_post", [<%= @post.id %>, current_comment_section]);
diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb
index 10c092ed6..5c3d7193f 100644
--- a/app/views/comments/partials/index/_list.html.erb
+++ b/app/views/comments/partials/index/_list.html.erb
@@ -6,7 +6,7 @@
   <div class="row notices">
     <% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
       <span class="info" id="threshold-comments-notice-for-<%= post.id %>">
-        <%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
+        <%= link_to "Show all comments", comments_path(:post_id => post.id), :remote => true %>
       </span>
     <% end %>
   </div>
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 5d9f9a306..d8f014098 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -1,6 +1,6 @@
 <% if CurrentUser.is_moderator? || (params[:search] && params[:search][:is_deleted] =~ /t/) || !comment.is_deleted? %>
   <a name="comment-<%= comment.id %>"></a>
-  <article class="comment" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator_name %>" data-is-sticky="<%= comment.is_sticky %>">
+  <article class="comment <%= "below-threshold" if comment.below_threshold? %>" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator_name %>" data-is-sticky="<%= comment.is_sticky %>">
     <div class="author">
       <h1>
         <%= link_to_user comment.creator %>