Backed out changeset 60b6bdaafba7 (bug 999071) for android 2.3 rc1 orange