Locator: revert porting to nfile