Revert "cnm"

This reverts commit 0cf1ef512d815973f80fe80568c5fc9f1417003c.