Second attempt at enabling comments.