Revert "CMSG not SMSG for a few lines"

This reverts commit 6c25a0efd032f4384c4e6e8da2a0f4acc96b9fa9.