Revert "NAPF HALO FIX #2"

This reverts commit bee85af5b29e27308fdbc7461839764ffda0e5cb.
Revert "NAPF HALO"

This reverts commit 87ca1ed1fc59b7d196bbbd8ff6f3d4c7d496d3d6.