Minor cleanup and aesthetic change
Revert "Revert "Revert "Globe disabling is commented out"""

This reverts commit 9e2ad0c2a5c0f2cf3a323bc06da97b1addb6cbe8.