Revert "Hover master switch (1/2)"

This reverts commit 3aed2e7a817c1243570d0cd942feb22169893463.