Backed out changeset d5d98779e401 (bug 846906) - again - for test failures on a CLOSED TREE.