Revert "Command tweak"

This reverts commit 3d97d24fd7640039892441860655a4ffb467818b.