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).
Great catch, thanks!  Should be resolved now.