Revert "Fix for GitHub issue #206 in upstream"

This reverts commit 720d05cedb100ab7282550224ddb848fe9bcd247.
Revert "Remove have command from bash completion"

This reverts commit 35477804408ea0155c371d64a538b78ed1932711.