Revert "Fix SystemUI FC"

This reverts commit f61b175c2a10ec97d8da27a39024964ecab3ee17.