Revert "use new cmd command"

This reverts commit 14637dea1cf7bd37244dd5053951744ea3b3f114.

Change-Id: Ia9b81c47120088593a56ae09a9b002338d524b8a
4 files changed