Revert "Fix remaining framworks & systemui HALO derps"

This reverts commit 502f6dd4a7b075cbd30ebf11b2d0a07688e8d0c0.