possible fix for google storage host bug

Thanks for this @burns, I've left a few comments below. 

This should fix #2294.