Revert "Merge branch 'maxim'"
Revert "Merge branch 'maxim'"

This breaks directions when the commandline has quotes in them.
Reverting until I have time to debug this.

This reverts commit 16f088ccc87c9e04984de0bf16bc0c76dae75ddf, reversing
changes made to ac6c3b0fe65a0fc386c7409e7d1b765919becb7f.

DarkStarSword/junk,DarkStarSword/junk,DarkStarSword/junk,DarkStarSword/junk,DarkStarSword/junk