Globe is no longer optional

Change-Id: Iff0466292c8cac64ad3c0f50616385e8daf0675c
Merge "Globe is no longer optional"