Migrate back to 2.2 android