Reverted changes that broke things under Windows.
Merge commit 'f55cdf740820e82d0a7169d2e4dce3df18fa306c'
Reverted changes that broke things under Windows.