Backed out changeset 4740975a1063 (bug 837458) for Android mochitest failures.