Backed out changeset 06ec442314d4 (bug 1074961) for Android crashes.