Revert, strange side affects to other (like lunch) commands.

This reverts commit 6acfdd62de0454c98b27db51cf0e6af7f2250d2f.

Change-Id: Ic0a84700912570ddec70d152767a9d40f8fa71b0
1 file changed