Backed out changeset fa836f2dccb6 for introducing new Win7 leaks.
CLOSED TREE