Revert "There should be always a zone given from lighty to us so try to get that first"

This reverts commit 497d0b192f8e065ec3b4d1d94764b51c924a89b8.