Revert "Issue #2289989 by marcingy, andypost: Remove comment_add and inline final occurrence."

This reverts commit 4b91f16d48490343f0d0c5abf1b915b21788550c.
Issue #2289989 by marcingy, andypost: Remove comment_add and inline final occurrence.