Reverts 965e106f24 Unfortunately, this caused breakage on Windows, and possibly elsewhere, because parentDir and takeDirectory do not behave the same when there is a trailing directory separator.
965e106f24
3bab5dfb1d