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

This reverts commit f20827a3d750d53ac447825880e03198efa70fe2, reversing
changes made to 9df5cfcb675f4526c11583ec7848ce0f4aaede9a.