Backed out changeset 95562517dc8c (bug 938818) for Android crashes.