Revert "Merge remote-tracking branch 'cm/cm-11.0' into HEAD" <-- BREAKS BUILD

This reverts commit 57a87030f3f88692f4d31a174df00f88196e70e9, reversing
changes made to 6f0179d3103e7d42680f74f491e003311fe2cba2.