Created by: slifty
This PR is super tiny and just adds a fallback to Locality if the state isn't specified.