Don't pull this yet, just previewing changes for #1606

We can pull this once we have a fully baked flashlight for all platforms (pending natty cross-platform builds).
This snuck in from some investigating I was doing on the geo lookup issue.  Since we took this out in devel too, I figure we can just leave as is.