Revert "shell script tweaks"

This reverts commit 37000057d51880be2ed52dcec0834613f47fdcd4.