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

This reverts commit bfc143a780d951804d472320c5b425bed1904e11, reversing
changes made to 0ede5e4d9576880b2af95d4e30ddf24cd2a6f3e9.