Backed out changeset e90d6be6dbf6 (bug 886329) for test failures. a=backout