This reverts commit add2ca7b. It causes too much breakage on windows. It is better to start again from scratch.
