Backout c619171e0070 for windows assertion failure on a CLOSED TREE