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

This reverts commit 0cb2bb8b9c3ba2e78a25c2cb31661a092eccfac4, reversing
changes made to af40cfd3ebf9f2a467eb793b73e3c60fdb0a3a48.