and make this work with pre-upgrade location info