Backed out changeset 8d8165293e9b (bug 976372) because of Windows debug bustage on a CLOSED TREE