Revert "Remove which
from shell invocations"
#16803
Merged
which
from shell invocations"
#16803