restore setvars.sh back to upstream's copy, maybe merges will work out
better?