Applied patch to remove NIS dependencies