Revert "cdc:  update with patches from mbm userspace"

This reverts commit c6dc72f90d62ba3dc2e5262e58e0fd0f8ecbdd8f.