Revert our HeadsUp implementation

Change-Id: Idd8cb4eec636142d1156299a11d2045dbf07f4c9