Breaks monkey in root mode. This reverts commit 6e16714c. Bug: 29338430 Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c