Revert "Improve sh syntax using ${} for all variables"

This was cherry-pick'd by mistake

This reverts commit 1702a838194d2f4ffaa99359f888a42b0832472a.