Revert to previous logic, keep log dir.