Revert "Hover master switch (2/2)"

This reverts commit 7ffd79010ea69c98679c22d34a3d49e6702127a9.