Revert "NH2: cbd"

This reverts commit d5e2d35dfaa440b3e79bf8312ccf2b6b99656c3a.