Revert "Turn off commenting feature."

This reverts commit aece0169a793af833bcec771653242300650eaca.
Merge branch 'master' into production