Revert "PTFM-12607 Improving bash helper variables"

This reverts commit f42f3f8d4d7fbd6936835ad3a428082a85711a81.