Do not use the user.dir property

Less disruptive change. This will probably have to be reviewed.