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

This reverts commit eb5a11a759c00fa9b01b5ce7223c5208687d37e8, reversing
changes made to 610459e5b7c74fd98b6595940c6ed43e11d17d84.