try harder to fix windows build

This reverts commit 3b26995b8e704438fc3f2cd5bb4c224d75f64b95.

Change-Id: I756e1730f8d9e87484710699177349166b87baaf