Revert "Modify app so it will run in ICS MR1"

This reverts commit b8d0a58e51251f4d65917fc27c86f9f0822478a9
12 files changed