Revert "Merge remote-tracking branch 'caf/kk_2.7_rb1.43' into cm-11.0"

This reverts commit 8a0c2b63872ca442c2098f63dc9054d6a4d4a739, reversing
changes made to 76b191e0e5abfe59c9a957783c2f4d84390aaad1.