Backout d1f27bcc360a (Bug 849114) for windows bustage CLOSED TREE