Revert "use new cmd command"

This reverts commit d039800a4e008b52c532f901e3bb34b40877cf30.

Change-Id: Ia9b81c47120088593a56ae09a9b002338d524b8a
4 files changed