Revert "NH2: cbd"

This reverts commit d5e2d35dfaa440b3e79bf8312ccf2b6b99656c3a.
This breaks network on s3.
Long term plan is to separate it for note 2 and s3, if necessary.
Doesn't present any noticeable improvements at the moment.