Revert "Merge branch 'cm-11.0' into kk-4.4"

This reverts commit 525dcb0c25f46e94c308ff9e91a1ea5cc683475a, reversing
changes made to a3e8f07a6b258f3583c736e2b8ca639e9c5c1dba.