Revert "Fix #4350 - spy stays on minimap"

This reverts commit 3dd3d8108895534e78077eda2984e3f6dd8e1b28.
Revert "Fix #4350"

This reverts commit 5645c3fe2d2b1256bed1f8fb20a19c7b24a09394.