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

This reverts commit 470f8912afaf99c9ff414c89161d62ba7a221de6, reversing
changes made to 48a846220d5d51d4e32d160d84fa17e01a40dbbd.