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

This reverts commit e8ad0de3a99f56f7668089bf2018179a4b074598, reversing
changes made to 829597eac3c5aacc464791beffafd52d9778924d.
Revert "Edited a derp"

This reverts commit 54f144dbf02bd6ce25f1ed5d3577a9bc955008a5.
Edited a derp (reverted from commit 54f144dbf02bd6ce25f1ed5d3577a9bc955008a5)