Revert "Don't rely and wildward match in basic shell"

This reverts commit 9b08a2a302adfbc71794c2c230364b6d4985325d.