Backed out changeset 86d0bd2a0233 (bug 992911) for android 2.3 bustage