Partially revert "Disabled comment plugin"