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

This reverts commit 42d2689048d2ce51587cfc85ab245cff2cbf205a, reversing
changes made to d62752b87eed417e08be834a6247647e08f75ab1.