shell_escape: allow double escapes to be done
replace old usage of shell_escape with new
Revert "shell_escape: allow double escapes to be done"

This reverts commit 4ff5aa3e156e048116811869ee31b5cbd3eebf71.
Revert "replace old usage of shell_escape with new"

This reverts commit a65d71412eb608fe952e7e21080c44ecda5be2dd.
fix shell_escape