Revert "shell expansion changed"

This reverts commit 8718144b874167d2444a9e94556837ae162acbda.