Revert last commit. It ruins the flow on Windows and causes serious problems on Ubuntu.

This reverts commit c238a5de109932accf839c08836b6b0091b0497b.