This reverts commit 95b04b11. Reason for revert: broke systemUI Change-Id: I8f901c98b8fe910bfdcca492f5e22ec2877b5c02