Revert "fixes for halo/hover from codex, slight changes by me."
If its not broke, dont try to fix it... chances are it'll break

This reverts commit bdbc1336b879af3b244e4c18b4bc683dc3d7fe27.

Change-Id: Ieb4257176667ed70a88349087abf90c2cd14c145