Add back geoip fetch in consumer info (bug 1043263)

https://bugzilla.mozilla.org/show_bug.cgi?id=1043263

Don't merge yet, this badly needs tests (seeing how we broke this without realizing it), but I'm waiting for the tests to be fixed on master first.