Revert "Merge branch 'cm/cm-11.0'"

This reverts commit 17ee4e9874193adadcdf7753f15a26d956f5843c, reversing
changes made to 21f470f07ecc5ec440a010d14064c71d766f0b81.