Re-add comment line from cmsg branch