See no benefit of it here, and also it has some unexpected
results with some commands that have enum commands, and
use a string item to update the currently selected item.

Change-Id: Iae54c4e1fb7a3aa5a7c1a03904fb3629ed63c8f0