Revert "Fix halo fc"

This reverts commit 34804790f81ecc290af2dd7e34dfaf0f07786bff.

Change-Id: I0f760f5952c496c5a9b403bc50924c591f2d4f13
Merge "Revert "Fix halo fc"" into kitkat