Revert "Revert "Revert "Fix for HeadsUp Tile TEST 2"""

This reverts commit 35bf21170363b29f3da480b68170707fca2cbaa6.
Revert "HeadsUp Tile TEST 2"

This reverts commit 02cdd491b0127c2cf0144dc03fe7309906d9d5af.