Revert "Moar Fixes"

This reverts commit 2d6309616e0dc739a01c9e4d93bf57abcc58e817.

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