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

This reverts commit ed975e2f09bccab5e3dc0856f6e366a7cad11e36, reversing
changes made to 2a1e653a4ad17e3790e39ede83762830a5ed59b1.