Revert "Squash Hover Improvements 1/2"

This reverts commit f680dc6ca3095ed48ed4b780f4ffe9d3b596cd6c.