Revert "Merge remote-tracking branch 'cm/cm-11.0' into merge_cm"

This reverts commit b82fd70b22b476a45b245f039d35a4d6dcbcb65d, reversing
changes made to 35cba6a3325867f74a277a5baa9cfc4e53db5c29.