Remove dependency on the infobase regions table