Revert "HALO fix 1"

This reverts commit 67aa4df760b30719b0c1685468cd0cd8bcb54eea.
Holo Fix 1.1