Backed out changeset b54e8c328c32 (bug 944800) because of test failures on a CLOSED TREE