Revert "Squash Hover Improvements 2/2"

This reverts commit 916258d21e7f672ab198b3d3637352edd79e046e.