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

This reverts commit f3f30f63fdfe77a06645de31affbd05511ff985f, reversing
changes made to f925a5d99f5e53f510d450f4bed6cf6ee7f7a530.