This patch proposes behavioral changes. In particular, referring
systems will need to provide client ids under all circumstances.