Backed out changeset df4ae5ba7d6e (bug 978861) due to m-o test failures.