Revert 5f889e3 and 7c83afb5 (related to traceCommandLine.js)