Revert "add addtl cm picks"

This reverts commit 229fc4c210785b79a732b9fc749d0e980cc3f860.
Revert "add cm cherry pick"

This reverts commit 114e99079c17d6b61a091e9ba944fe6f4526999c.
Go home DSP, your drunk