Backport of more talkative locator