Revert "S2W fixing cmdline interfacing"

This reverts commit d12efa43bfeb97aecab8625049d003e3fc71918e.