Back out 28db68d1a57a (bug 842911) for Android 2.2 destruction
CLOSED TREE