Revert "Hover master switch (1/2)"

This reverts commit 53d0d28147023f658eab33e514abd7da99566441.