reverts attempt 1 to fix toolsdir. uses signing_env to isolate issue
Merge branch 'clone_less' into clone_less-dev