Backed out changeset be8277dd0acd (bug 877072) for test failures.
CLOSED TREE