Revert "prefer shell_out_and_exit"

This reverts commit 5f6dfd8cb93a0a7e98b9b47779837ea6375c32bc.