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

This reverts commit 33c4ed3231fedea51005f8e05702828fd05ee13f, reversing
changes made to 52e64d1607aa9f4859aa265ea7312a602375f272.
Revert "Merge remote-tracking branch 'cm/stable/cm-11.0' into cm-11.0"

This reverts commit 52e64d1607aa9f4859aa265ea7312a602375f272, reversing
changes made to 57e1d23da95addd79990787b9f642ac33d65bdc9.