I moved this logic into `Comments` in f549223 since it seems to fit better there