Revert "Merge pull request #15 from CyanogenMod/cm-11.0"

This reverts commit 1132a692fb3a539da25e21b4d74bd201ffc75ef9, reversing
changes made to 6df2af7d2911522d269c5799c5172672469a58a8.