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

This reverts commit 9d54d56059dbadccbcf6315e6598c0ae3b4ac2d8, reversing
changes made to 83cdc632564855a2e906c885b3580619689083a6.