Revert "Bring in CM fwb constants and symbols"

This reverts commit 71292cd0c59720ecb334fa3189e2686f29487cb5.