Removed windows workaround