Revert "Remove comment count"

This reverts commit c56db2551c4d52d0119ab55691c1562611e3e2fa.