Backed out changeset eff8e7fefffd (bug 883164) for breaking the test on Android