I don't think this is correct. This function only removes the comment form if the field is empty. What's happening now with this change is that if the field is not empty, we're keeping the comment form, but adding the Add Comment link.

The bug I've seen is that the comment form doesn't actually seem to always go away, so my hunch is that some other bit of logic isn't working quite right leading up to this.

I'm sure this change does bring back the link, but I think it's masking the actual problem, which we still need to find.