Do we still need this? I don't think it is needed since we don't use locator anymore.