partial revert of envsetup.sh toolchain modification