Revert "Sort out casing for recent commit"

This reverts commit 5efe80d67bb23d58eb06e4047ebd0d5c0e655e61.
Revert "Back to Cyanogenmod"

This reverts commit 48c36fffe8020de8dd012572b0d80a71e0ea642e.