Revert "Merge remote-tracking branch 'remotes/cm/cm-11.0' into kk-4.4"

This reverts commit 486cc537e679c3a0da223622598a97cca54d1a7f, reversing
changes made to 5f80a8d91a94017074ec065408a1270c1d80ae12.