Reenable cirrus as an alternative after the outage

I *think* this will reenable geo as well.

Change-Id: I6acc4d4aa21c7e32ef444a1166b6d84487e80c82