Revert "Fix Hover build"

This reverts commit 9744d589c4dfe8f7d73e792b05da898e9bd334aa.
Revert " HOVER: Fix a couple of things:"

This reverts commit 27d2fc2e6fed8ce452bb298d5750a3b457eb4964.