Backed out changeset e40a4d279e30 (bug 1098096) for Android bustage.