This reverts commit 933bf11c. Reason for revert: Broke shell commands. Change-Id: Icbe1e4089d2607d9bfa839ceb2e1ffad4f08e892 Fixes: 144317147