Revert "Fix command-line for CWM compatibility"

This reverts commit c454583a4152027fe9776f965c981bb2e826c18b.