adapt to latest upstream modification of workdir