Backed out changeset ed9194eec73b (bug 958796) for multiple OSX debug failures on a CLOSED TREE