Not using this now but it might come in handy later
Make tz selection test non-system-specific