Revert "Update ICommandLine (bug 6259)."

This reverts commit 026a80454f88695d3ea7d616c260fea7c263de2d.