Sorry to have to revert this, but it is too broken on Windows.
Even on linux it needed some work to get right. Just stick with
what was there while the author works on a better version.

This reverts commit 21155b87.

Change-Id: Iaa075c2bd4d2fccf4d58052888735bedc83605c7