This reverts commit 860f61b4. Reason for revert: Broke one sysui test Change-Id: If43b21fc6588bbbb0e42e5159f70c94e52773c2a