Backout 79296b6a6026 (bug 980549) for test failures, CLOSED TREE.