Backed out changeset da83ebcf2099 (bug 1013226) for breaking Android nightlies.