Revert "Merge pull request #2 from ParanoidAndroid/jellybean"

This reverts commit f97f737448aec8efd4fea3a3aeb793418c8542ff, reversing
changes made to a4b315a4fb335da02771eab914f3f24f1cfba494.