put back cwd as the fallback basedir for more determinism
3.31.1