This reverts commit a822ccd7. Reason for revert: Broke a shell-transition CTS test (b/210902428) Change-Id: I479a6152f94cc6aff30caa8f49932c53d420db1e