This reverts commit 911cbd0c. This patch is broken on Linux and I don't want to think about the functionality during the Windows port. We can reconsider it after v0.6.