Removing XXX comment no longer applies: comment_thread is now materialized