Revert "BugFix"

This reverts commit 0f2f9d8f922e0bf30f931f5e6a4cbc7f529491f3.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java