Revert "Fix detection of the "command" command line argument. Fixes #351."

This reverts commit cab8ca525327f22ae21759781611ff8b2b0c83ab.