"[Comments] Batch resolve #7236" This reverts commit b8cc60697b, reversing changes made to e3791aefdc.
b8cc60697b
e3791aefdc