Revert "Merge remote-tracking branch 'cm/cm-11.0' into cm-10.2"

This reverts commit 182966773761b873a7f76d6c765562dc197dda08, reversing
changes made to 73c4ea6ad6e94f3b483d992620496a08b0aca0c6.