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

This reverts commit 9e730be24265a3923067b6c7552468ad85e19d8c, reversing
changes made to f405047a93ceb07c93e775a8631228914ef51c37.