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

This reverts commit 6ca67471140a8280d21e65de7fae80853df22389, reversing
changes made to 67338709fdb8094e2816c75362d388f05fdbed04.