backout caf13c3365f3 for Windows bustage CLOSED TREE