Revert "Lets ease off CM fw/native temporarily"

This reverts commit 8f071a6086cc0634955f640eede2754d7474976f.