Merging (I think?) location update timeout work in.