Restore command changes

Change-Id: If416f0db72c9d6770c9872da269a1ccf223bd1f4