Revert "Other fix for HeadsUp"

This reverts commit 29a87d06e16a48403ad2b145d7149835e113db0f.
Revert "Fx some error for HeadsUp"

This reverts commit 8dd460326af2f64989953b254117b8922f60db27.